summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2011-01-05Git 1.7.4-rc1v1.7.4-rc1Junio C Hamano3-3/+9
2011-01-05Merge branch 'maint' to sync with 1.7.3.5Junio C Hamano1-0/+2
2011-01-05Git 1.7.3.5v1.7.3.5Junio C Hamano2-1/+3
2011-01-05Merge branch 'jn/svn-fe' (early part)Junio C Hamano2-25/+47
2011-01-05Merge branch 'ao/t9001-fix'Junio C Hamano1-4/+4
2011-01-05Merge branch 'pw/convert-pathname-substitution'Junio C Hamano3-1/+75
2011-01-05Merge branch 'mg/cvsimport'Junio C Hamano2-11/+31
2011-01-04t/t9001-send-email.sh: fix '&&' chain in some testsAntonio Ospite1-4/+4
2011-01-04cvsimport: handle the parsing of uppercase config optionsMichael J Gruber2-4/+24
2011-01-04Merge branch 'maint'Junio C Hamano2-3/+3
2011-01-04daemon: support <directory> arguments againJonathan Nieder1-3/+4
2011-01-04Fix typos in the documentationRalf Wildenhues12-27/+26
2011-01-04gitweb: skip logo in atom feed when there is noneJonathan Nieder1-1/+1
2010-12-29t9001: Fix test prerequisitesRobin H. Johnson1-2/+2
2010-12-28Git 1.7.4-rc0v1.7.4-rc0Junio C Hamano2-11/+10
2010-12-28Merge branch 'maint'Junio C Hamano3-2/+37
2010-12-28Prepare for 1.7.3.5Junio C Hamano2-1/+33
2010-12-28Merge branch 'jk/commit-die-on-bogus-ident' into maintJunio C Hamano3-24/+40
2010-12-28Merge branch 'ks/blame-worktree-textconv-cached' into maintJunio C Hamano2-2/+23
2010-12-28Merge branch 'jc/maint-rebase-rewrite-last-skip' into maintJunio C Hamano2-8/+17
2010-12-28Merge branch 'jc/maint-am-abort-safely' into maintJunio C Hamano2-2/+34
2010-12-28Merge branch 'kb/maint-status-cquote' into maintJunio C Hamano1-0/+10
2010-12-28t9001: use older Getopt::Long boolean prefix '--no' rather than '--no-'Brandon Casey1-1/+1
2010-12-28Merge branch 'jc/maint-rebase-rewrite-last-skip'Junio C Hamano2-8/+17
2010-12-28Merge branch 'nd/setup'Junio C Hamano17-134/+4868
2010-12-28Fix false positives in t3404 due to SHELL=/bin/falseRobin H. Johnson1-1/+2
2010-12-27setup_work_tree: adjust relative $GIT_WORK_TREE after moving cwdNguyễn Thái Ngọc Duy5-0/+38
2010-12-26Merge branch 'rs/maint-diff-fd-leak' into maintJunio C Hamano1-1/+3
2010-12-26close file on error in read_mmfile()René Scharfe1-1/+3
2010-12-23Merge branch 'rj/maint-difftool-cygwin-workaround'Junio C Hamano1-4/+8
2010-12-22Merge branch 'maint'Junio C Hamano1-1/+1
2010-12-22Makefile: add NO_FNMATCH_CASEFOLD to IRIX sectionsBrandon Casey1-0/+2
2010-12-22test-lib.sh/test_decode_color(): use octal not hex in awk scriptBrandon Casey1-1/+1
2010-12-22rebase --skip: correctly wrap-up when skipping the last patchJunio C Hamano2-8/+17
2010-12-22t0021: avoid getting filter killed with SIGPIPEJunio C Hamano1-0/+1
2010-12-22Merge branch 'rj/maint-test-fixes'Junio C Hamano4-23/+35
2010-12-22Merge branch 'jc/maint-am-abort-safely'Junio C Hamano2-2/+34
2010-12-22Merge branch 'jk/commit-die-on-bogus-ident'Junio C Hamano3-24/+40
2010-12-22Merge branch 'pd/bash-4-completion'Junio C Hamano1-78/+290
2010-12-22Merge branch 'nd/maint-fix-add-typo-detection'Junio C Hamano6-53/+254
2010-12-22Merge branch 'tf/commit-list-prefix'Junio C Hamano9-35/+35
2010-12-22git.txt: correct where --work-tree path is relative toNguyễn Thái Ngọc Duy1-1/+1
2010-12-22Revert "Documentation: always respect core.worktree if set"Nguyễn Thái Ngọc Duy1-15/+8
2010-12-22t0001: test git init when run via an aliasJonathan Nieder1-0/+56
2010-12-22Remove all logic from get_git_work_tree()Nguyễn Thái Ngọc Duy3-28/+19
2010-12-22setup: rework setup_explicit_git_dir()Nguyễn Thái Ngọc Duy2-203/+221
2010-12-22setup: clean up setup_discovered_git_dir()Nguyễn Thái Ngọc Duy2-48/+48
2010-12-22t1020-subdirectory: test alias expansion in a subdirectoryMichael J Gruber1-0/+8
2010-12-22setup: clean up setup_bare_git_dir()Nguyễn Thái Ngọc Duy1-10/+9
2010-12-22setup: limit get_git_work_tree()'s to explicit setup case onlyNguyễn Thái Ngọc Duy5-37/+51
2010-12-22Use git_config_early() instead of git_config() during repo setupNguyễn Thái Ngọc Duy1-12/+35
2010-12-22Add git_config_early()Nguyễn Thái Ngọc Duy2-5/+15
2010-12-22convert filter: supply path to external driverPete Wyckoff3-1/+74
2010-12-21Merge branch 'maint'Junio C Hamano2-4/+4
2010-12-21Merge branch 'ks/blame-worktree-textconv-cached'Junio C Hamano2-2/+23
2010-12-21Merge branch 'jk/t2107-now-passes'Junio C Hamano1-1/+1
2010-12-21Merge branch 'jk/maint-decorate-01-bool'Junio C Hamano1-5/+3
2010-12-21Merge branch 'tc/completion-reflog'Junio C Hamano1-1/+12
2010-12-21Merge branch 'nd/oneline-sha1-name-from-specific-ref'Junio C Hamano3-28/+134
2010-12-21Merge branch 'jn/maint-gitweb-pathinfo-fix'Junio C Hamano1-8/+23
2010-12-21t0050: fix printf format strings for portabilityJonathan Nieder1-2/+2
2010-12-21t3419-*.sh: Fix arithmetic expansion syntax errorRamsay Jones1-2/+2
2010-12-21am --abort: keep unrelated commits since the last failure and warnJunio C Hamano2-2/+34
2010-12-21set_try_to_free_routine(NULL) means "do nothing special"Junio C Hamano2-6/+4
2010-12-20commit: die before asking to edit the log messageJunio C Hamano1-22/+32
2010-12-20completion: add missing configuration variablesMartin von Zweigbergk1-4/+66
2010-12-20ident: die on bogus date formatJeff King2-2/+8
2010-12-19fill_textconv(): Don't get/put cache if sha1 is not validKirill Smelkov2-4/+3
2010-12-19t/t8006: Demonstrate blame is broken when cachetextconv is onKirill Smelkov1-0/+22
2010-12-19Merge branch 'maint'Junio C Hamano6-50/+52
2010-12-19t9300: use perl "head -c" clone in place of "dd bs=1 count=16000" klugeJonathan Nieder1-35/+49
2010-12-19t2107: mark passing test as successJeff King1-1/+1
2010-12-19handle arbitrary ints in git_config_maybe_boolJeff King1-5/+3
2010-12-19builtin/rm.c: Use ALLOC_GROW instead of alloc_nr and xrealloc.Thiago Farina1-10/+2
2010-12-19builtin/branch.c: Use ALLOC_GROW instead of alloc_nr and xrealloc.Thiago Farina1-6/+1
2010-12-18gitweb: Include links to feeds in HTML header only for '200 OK' responseJakub Narebski1-42/+47
2010-12-18fsck docs: remove outdated and useless diagnosticMark Lodato1-3/+0
2010-12-18userdiff: fix typo in ruby and python word regexesThomas Rast1-2/+2
2010-12-17trace.c: mark file-local function staticVasyl' Vavrychuk1-1/+1
2010-12-17bash completion: add basic support for git-reflogTay Ray Chuan1-1/+12
2010-12-17Fix typo in git-gc document.Jiang Xin2-2/+2
2010-12-16Update draft release notes to 1.7.4Junio C Hamano2-7/+43
2010-12-16Merge branch 'maint'Junio C Hamano2-2/+5
2010-12-16get_sha1: handle special case $commit^{/}Nguyễn Thái Ngọc Duy1-0/+7
2010-12-16difftool: provide basename to external toolsMichael J Gruber2-0/+2
2010-12-16git-difftool.txt: correct the description of $BASE and describe $MERGEDMichael J Gruber1-2/+3
2010-12-16Merge branch 'kb/diff-C-M-synonym'Junio C Hamano2-10/+10
2010-12-16Merge branch 'jn/fast-import-blob-access'Junio C Hamano3-31/+447
2010-12-16Merge branch 'jl/fetch-submodule-recursive'Junio C Hamano8-17/+387
2010-12-16Merge branch 'rj/msvc-fix'Junio C Hamano4-7/+8
2010-12-16Merge branch 'nd/extended-sha1-relpath'Junio C Hamano5-4/+127
2010-12-16Merge branch 'aa/status-hilite-branch'Junio C Hamano7-9/+31
2010-12-16Merge branch 'ak/describe-exact'Junio C Hamano1-25/+60
2010-12-16Merge branch 'nd/maint-relative'Junio C Hamano1-0/+6
2010-12-16Merge branch 'jn/maint-svn-fe'Junio C Hamano5-10/+38
2010-12-16Merge branch 'jc/maint-svn-info-test-fix'Junio C Hamano1-72/+34
2010-12-16Merge branch 'jn/submodule-b-current'Junio C Hamano2-20/+24
2010-12-16Merge branch 'jn/maint-fast-import-object-reuse'Junio C Hamano1-7/+2
2010-12-16Merge branch 'jn/fast-import-ondemand-checkpoint'Junio C Hamano2-1/+47
2010-12-15Sync with 1.7.3.4Junio C Hamano9-18/+114
2010-12-15Git 1.7.3.4v1.7.3.4Junio C Hamano9-18/+113
2010-12-15Git 1.7.2.5v1.7.2.5Junio C Hamano9-19/+111
2010-12-15Git 1.7.1.4v1.7.1.4Junio C Hamano8-19/+104
2010-12-15Git 1.7.0.9v1.7.0.9Junio C Hamano7-19/+96
2010-12-15Git 1.6.6.3v1.6.6.3Junio C Hamano6-19/+88
2010-12-15Git 1.6.5.9v1.6.5.9Junio C Hamano5-18/+64
2010-12-15Git 1.6.4.5v1.6.4.5Junio C Hamano3-2/+22
2010-12-15gitweb: Introduce esc_attr to escape attributes of HTML elementsJakub Narebski1-15/+22
2010-12-15Merge branch 'master' (early part) into pd/bash-4-completionJonathan Nieder584-9760/+25026
2010-12-14bash: simple reimplementation of _get_comp_words_by_refJonathan Nieder1-8/+110
2010-12-14bash: get --pretty=m<tab> completion to work with bash v4Peter van der Does1-76/+160
2010-12-14get_sha1: support $commit^{/regex} syntaxNguyễn Thái Ngọc Duy3-11/+105
2010-12-14difftool: Fix failure on CygwinRamsay Jones1-4/+8
2010-12-14t9501-*.sh: Fix a test failure on CygwinRamsay Jones1-1/+1
2010-12-14lib-git-svn.sh: Add check for mis-configured web server variablesRamsay Jones1-0/+10
2010-12-14lib-git-svn.sh: Avoid setting web server variables unnecessarilyRamsay Jones1-22/+25
2010-12-14t9142: Move call to start_httpd into the setup testRamsay Jones1-3/+2
2010-12-14t3600-rm.sh: Don't pass a non-existent prereq to test #15Ramsay Jones1-1/+1
2010-12-14gitweb: Fix handling of whitespace in generated linksJakub Narebski1-8/+23
2010-12-14Merge git://git.kernel.org/pub/scm/gitk/gitkJunio C Hamano3-305/+1654
2010-12-14Merge branch 'maint'Junio C Hamano3-5/+14
2010-12-14Prepare for 1.7.3.4Junio C Hamano1-0/+10
2010-12-14use persistent memory for rejected pathsClemens Buchacher4-42/+38
2010-12-14do not overwrite files in leading pathClemens Buchacher4-10/+31
2010-12-14lstat_cache: optionally return match_lenClemens Buchacher1-16/+27
2010-12-14add function check_ok_to_remove()Clemens Buchacher1-49/+58
2010-12-14t7607: add leading-path testsClemens Buchacher1-0/+51
2010-12-14t7607: use test-lib functions and check MERGE_HEADClemens Buchacher1-23/+15
2010-12-14Merge branch 'jc/maint-no-openssl-build-fix' into maintJunio C Hamano1-0/+4
2010-12-14Merge branch 'ja/maint-pull-rebase-doc' into maintJunio C Hamano1-2/+3
2010-12-14Merge branch 'tc/http-urls-ends-with-slash' into maintJunio C Hamano9-40/+55
2010-12-14Merge branch 'nd/maint-hide-checkout-index-from-error' into maintJunio C Hamano1-8/+8
2010-12-14Merge branch 'jk/maint-reflog-bottom' into maintJunio C Hamano3-2/+37
2010-12-14Merge branch 'mz/rebase-abort-reflog-fix' into maintJunio C Hamano2-9/+22
2010-12-14Merge branch 'mz/maint-rebase-stat-config' into maintJunio C Hamano1-1/+2
2010-12-14Merge branch 'gc/http-with-non-ascii-username-url' into maintJunio C Hamano5-1/+51
2010-12-14gitk: Add Brazilian Portuguese (pt-BR) translationAlexandre Erwin Ittner1-0/+1277
2010-12-13t800?-blame.sh: retitle uniquelyMichael J Gruber2-0/+0
2010-12-13tests: flip executable bit on t9158Jeff King1-0/+0
2010-12-13tests: add some script lint checksJeff King1-2/+14
2010-12-13Avoid duplicate test number t7609Johannes Sixt1-0/+0
2010-12-12t9300: avoid short reads from ddJonathan Nieder1-3/+3
2010-12-12get_sha1_oneline: make callers prepare the commit list to traverseNguyễn Thái Ngọc Duy1-8/+11
2010-12-12get_sha1_oneline: fix lifespan rule of temp_commit_buffer variableJunio C Hamano1-11/+13
2010-12-12Merge branch 'jn/parse-options-extra'Junio C Hamano7-198/+303
2010-12-12Merge branch 'ja/maint-pull-rebase-doc'Junio C Hamano1-2/+3
2010-12-12Merge branch 'gb/web--browse'Junio C Hamano2-85/+98
2010-12-12Merge branch 'js/configurable-tab'Junio C Hamano7-19/+190
2010-12-12Merge branch 'nd/maint-hide-checkout-index-from-error'Junio C Hamano1-8/+8
2010-12-12Merge branch 'jn/gitweb-per-request-config'Junio C Hamano2-3/+35
2010-12-12Merge branch 'ef/help-cmd-prefix'Junio C Hamano2-8/+41
2010-12-12Merge branch 'tc/http-urls-ends-with-slash'Junio C Hamano9-40/+55
2010-12-12Merge branch 'tc/format-patch-p'Junio C Hamano2-0/+25
2010-12-12Merge branch 'ef/win32-dirent'Junio C Hamano7-248/+137
2010-12-12Merge branch 'mz/rebase-i-verify'Junio C Hamano3-0/+9
2010-12-12Merge branch 'mz/rebase-abort-reflog-fix'Junio C Hamano2-9/+22
2010-12-12Merge branch 'jk/maint-reflog-bottom'Junio C Hamano3-2/+37
2010-12-12Merge branch 'jk/asciidoc-update'Junio C Hamano6-29/+27
2010-12-12Merge branch 'mz/pull-rebase-rebased'Junio C Hamano2-2/+15
2010-12-12Merge branch 'mz/maint-rebase-stat-config'Junio C Hamano1-1/+2
2010-12-12Merge branch 'jn/git-cmd-h-bypass-setup'Junio C Hamano14-0/+193
2010-12-12gitk: Make text selectable on MacStefan Haller1-0/+1
2010-12-12gitk: Prevent the text pane from becoming editableStefan Haller1-0/+1
2010-12-12gitk: Add the equivalent of diff --color-wordsThomas Rast1-3/+61
2010-12-12gitk: Update Swedish translation (290t)Peter Krefting1-298/+303
2010-12-10Relnotes: remove items fixed on 'maint'Junio C Hamano1-13/+0
2010-12-10Merge branch 'maint'Junio C Hamano2-0/+35
2010-12-10Prepare for 1.7.3.4Junio C Hamano2-1/+33
2010-12-10Merge branch 'jk/maint-decorate-01-bool' into maintJunio C Hamano2-2/+23
2010-12-10Merge branch 'mg/maint-tag-rfc1991' into maintJunio C Hamano5-20/+88
2010-12-10Merge branch 'ks/maint-getenv-fix' into maintJunio C Hamano1-0/+1
2010-12-10diff: use "find" instead of "detect" as prefix for long forms of -M and -CYann Dirson2-12/+11
2010-12-10default color.status.branch to "same as header"Jeff King3-2/+15
2010-12-10thread-utils.h: simplify the inclusionJunio C Hamano4-12/+4
2010-12-10Makefile: transport-helper uses thread-utils.hJonathan Nieder1-2/+1
2010-12-10Add --force to git-send-email documentationAlejandro R. Sedeño1-0/+3
2010-12-09fetch_populated_submodules(): document dynamic allocationJunio C Hamano1-1/+2
2010-12-09Merge git://git.bogomips.org/git-svnJunio C Hamano3-4/+56
2010-12-09msvc: Fix macro redefinition warningsRamsay Jones1-6/+0
2010-12-09msvc: Fix build by adding missing INTMAX_MAX defineRamsay Jones1-0/+4
2010-12-09Documentation/git.txt: update list of maintenance releasesJunio C Hamano1-4/+8
2010-12-09get_sha1: teach ":$n:<path>" the same relative path logicJunio C Hamano2-6/+32
2010-12-10t9143: do not fail when unhandled.log.gz is not createdTorsten Bögershausen1-3/+1
2010-12-10git-svn: allow the mergeinfo property to be setSteven Walter2-1/+55
2010-12-09describe: Delay looking up commits until searching for an inexact matchAnders Kaseorg1-15/+22
2010-12-09describe: Store commit_names in a hash table by commit SHA1Anders Kaseorg1-5/+33
2010-12-09describe: Do not use a flex array in struct commit_nameAnders Kaseorg1-6/+6
2010-12-09describe: Use for_each_rawrefAnders Kaseorg1-1/+1
2010-12-09msvc: git-daemon.exe: Fix linker "unresolved externals" errorRamsay Jones1-1/+1
2010-12-09msvc: Fix compilation errors in compat/win32/sys/poll.cRamsay Jones1-0/+3
2010-12-09Merge branch 'maint'Junio C Hamano1-4/+4
2010-12-09Merge branch 'jn/ignore-doc' into maintJunio C Hamano1-7/+23
2010-12-09Merge branch 'jn/cherry-pick-refresh-index' into maintJunio C Hamano2-2/+26
2010-12-09Merge branch 'jl/add-p-reverse-message' into maintJunio C Hamano1-2/+11
2010-12-09Merge branch 'np/diff-in-corrupt-repository' into maintJunio C Hamano1-2/+6
2010-12-09Merge branch 'fc/apply-p2-get-header-name' into maintJunio C Hamano2-14/+40
2010-12-09Merge branch 'np/pack-broken-boundary' into maintJunio C Hamano1-1/+15
2010-12-09Merge branch 'ak/apply-non-git-epoch' into maintJunio C Hamano5-6/+57
2010-12-09Merge branch 'cm/diff-check-at-eol' into maintJunio C Hamano2-1/+10
2010-12-09Merge branch 'tc/smart-http-post-redirect' into maintJunio C Hamano3-0/+20