summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2014-10-31Git 2.2.0-rc0v2.2.0-rc0Junio C Hamano2-1/+7
2014-10-31Merge branch 'for-junio' of git://bogomips.org/git-svnJunio C Hamano4-91/+145
2014-10-31Merge branch 'jc/push-cert'Junio C Hamano1-2/+2
2014-10-31Merge branch 'rs/child-process-init'Junio C Hamano1-1/+1
2014-10-31Merge branch 'rs/grep-color-words'Junio C Hamano4-9/+123
2014-10-31git-svn: use SVN::Ra::get_dir2 when possibleEric Wong1-1/+11
2014-10-30Merge git://ozlabs.org/~paulus/gitkJunio C Hamano1-69/+23
2014-10-30git-svn: add space after "W:" prefix in warningEric Wong1-4/+2
2014-10-30git-svn: (cleanup) remove editor param passingEric Wong1-6/+4
2014-10-30gitk: Remove boilerplate for configuration variablesMax Kirillov1-68/+20
2014-10-30gitk: Show detached HEAD if --all is specifiedMax Kirillov1-0/+2
2014-10-30gitk: Do not depend on Cygwin's "kill" command on WindowsSebastian Schuberth1-1/+1
2014-10-29git-svn: prepare SVN::Ra config pieces onceEric Wong1-27/+36
2014-10-29Git.pm: add specified name to tempfile templateEric Wong1-1/+4
2014-10-29Sync with Git 2.1.3Junio C Hamano2-1/+28
2014-10-29Git 2.1.3v2.1.3Junio C Hamano4-3/+30
2014-10-29Merge branch 'jk/pack-objects-no-bitmap-when-splitting' into maintJunio C Hamano2-0/+10
2014-10-29Merge branch 'da/mergetool-meld' into maintJunio C Hamano2-2/+16
2014-10-29Merge branch 'rm/gitweb-start-form' into maintJunio C Hamano1-2/+2
2014-10-29Merge branch 'bc/asciidoc-pretty-formats-fix' into maintJunio C Hamano1-1/+1
2014-10-29Merge branch 'rs/daemon-fixes' into maintJunio C Hamano1-18/+15
2014-10-29Update draft release notes to 2.2Junio C Hamano1-0/+17
2014-10-29Merge branch 'da/difftool'Junio C Hamano4-1/+85
2014-10-29Merge branch 'rb/pack-window-memory-config-doc'Junio C Hamano1-4/+5
2014-10-29Merge branch 'mg/lib-gpg-ro-safety'Junio C Hamano1-0/+1
2014-10-29Merge branch 'dm/port2zos'Junio C Hamano3-3/+7
2014-10-29Merge branch 'oc/mergetools-beyondcompare'Junio C Hamano4-27/+28
2014-10-29Merge branch 'jk/prune-mtime'Junio C Hamano23-436/+836
2014-10-29Merge branch 'bc/asciidoctor'Junio C Hamano1-11/+15
2014-10-28api-run-command: add missing list item markerRené Scharfe1-1/+1
2014-10-28receive-pack: avoid minor leak in case start_async() failsRené Scharfe1-2/+2
2014-10-28difftool: add support for --trust-exit-codeDavid Aguilar4-0/+75
2014-10-28grep: add color.grep.matchcontext and color.grep.matchselectedRené Scharfe4-9/+123
2014-10-28config.txt: pack.windowmemory limit applies per-threadRobert de Bath1-4/+5
2014-10-27t/lib-gpg: make gpghome files writableMichael J Gruber1-0/+1
2014-10-27Documentation: remove Asciidoctor linkgit macrobrian m. carlson1-39/+0
2014-10-27Documentation: refactor common operations into variablesbrian m. carlson1-11/+11
2014-10-27compat/bswap.h: detect endianness from XL C compiler macrosDavid Michael1-0/+4
2014-10-27Makefile: reorder linker flags in the git executable ruleDavid Michael1-2/+2
2014-10-27git-compat-util.h: support variadic macros with the XL C compilerDavid Michael1-1/+1
2014-10-27difftool--helper: exit when reading a prompt answer failsJohannes Sixt2-1/+10
2014-10-27git-svn: disable _rev_list memoizationEric Wong1-10/+0
2014-10-25git-svn: save a little memory as fetch progressesEric Wong1-1/+1
2014-10-25git-svn: remove unnecessary DESTROY overrideEric Wong1-4/+0
2014-10-24git-svn: reload RA every log-window-sizeEric Wong1-8/+13
2014-10-24git-svn.txt: advertise pushurl with dcommitSveinung Kvilhaugsvik1-0/+4
2014-10-24git-svn: remove mergeinfo rev cachingEric Wong1-21/+9
2014-10-24git-svn: cache only mergeinfo revisionsEric Wong1-14/+8
2014-10-24git-svn: reduce check_cherry_pick cache overheadEric Wong1-13/+15
2014-10-24git-svn: only look at the root path for svn:mergeinfoJakob Stoklund Olesen1-16/+13
2014-10-24git-svn: only look at the new parts of svn:mergeinfoJakob Stoklund Olesen1-12/+72
2014-10-24Update draft release notes to 2.2Junio C Hamano1-0/+11
2014-10-24Merge branch 'jc/push-cert'Junio C Hamano2-1/+56
2014-10-24Merge branch 'sb/plug-transport-leak'Junio C Hamano2-0/+2
2014-10-24Merge branch 'nd/dir-prep-exclude-cleanup'Junio C Hamano1-1/+1
2014-10-24Merge branch 'eb/no-pthreads'Junio C Hamano7-12/+58
2014-10-24Merge branch 'wk/t1304-wo-USER'Junio C Hamano1-1/+1
2014-10-24Merge branch 'tb/core-filemode-doc'Junio C Hamano1-6/+19
2014-10-24Merge branch 'rs/run-command-env-array'Junio C Hamano8-39/+38
2014-10-24Merge branch 'po/doc-status-markup'Junio C Hamano1-2/+2
2014-10-24Merge branch 'jk/pack-objects-no-bitmap-when-splitting'Junio C Hamano2-0/+10
2014-10-24push: heed user.signingkey for signed pushesMichael J Gruber2-1/+56
2014-10-21Update draft release notes to 2.2Junio C Hamano1-4/+17
2014-10-21Merge branch 'js/completion-hide-not-a-repo'Junio C Hamano1-1/+2
2014-10-21Merge branch 'da/mergetool-meld'Junio C Hamano2-2/+16
2014-10-21Merge branch 'da/mergetool-temporary-directory'Junio C Hamano3-4/+60
2014-10-21Merge branch 'da/mergetool-tool-help'Junio C Hamano4-14/+21
2014-10-21Merge branch 'da/mergetool-temporary-filename'Junio C Hamano1-5/+11
2014-10-21Merge branch 'da/mergetool-tests'Junio C Hamano2-471/+469
2014-10-21Merge branch 'rs/ref-transaction'Junio C Hamano45-350/+849
2014-10-21mergetool: rename bc3 to bcJunio C Hamano4-27/+28
2014-10-21dir.c: remove the second declaration of "stk" in prep_exclude()Nguyễn Thái Ngọc Duy1-1/+1
2014-10-21.mailmap: add Stefan Bellers corporate mail addressStefan Beller1-0/+1
2014-10-21transport: free leaking head in transport_print_push_status()Stefan Beller1-0/+1
2014-10-20Update draft release notes to 2.2Junio C Hamano1-5/+17
2014-10-20Merge branch 'cc/interpret-trailers'Junio C Hamano10-0/+2084
2014-10-20Merge branch 'rm/gitweb-start-form'Junio C Hamano1-2/+2
2014-10-20Merge branch 'ss/contrib-subtree-contacts'Junio C Hamano4-3/+83
2014-10-20Merge branch 'jn/parse-config-slot'Junio C Hamano13-50/+47
2014-10-20Merge branch 'rs/receive-pack-argv-leak-fix'Junio C Hamano1-10/+8
2014-10-20Merge branch 'ta/config-set'Junio C Hamano1-2/+2
2014-10-20Merge branch 'jk/test-shell-trace'Junio C Hamano4-35/+84
2014-10-20Merge branch 'bc/asciidoc'Junio C Hamano4-5/+5
2014-10-20Revert "archive: honor tar.umask even for pax headers"Junio C Hamano2-7/+2
2014-10-19core.filemode may need manual actionTorsten Bögershausen1-6/+19
2014-10-19doc: fix 'git status --help' character quotingPhilip Oakley1-2/+2
2014-10-19t1304: Set LOGNAME even if USER is unset or nullW. Trevor King1-1/+1
2014-10-19Handle atexit list internaly for unthreaded buildsEtienne Buira4-10/+47
2014-10-19drop add_object_array_with_modeJeff King2-7/+1
2014-10-19revision: remove definition of unused 'add_object' functionRamsay Jones2-15/+0
2014-10-19use env_array member of struct child_processRené Scharfe5-38/+25
2014-10-19run-command: add env_array, an optional argv_array for envRené Scharfe3-1/+13
2014-10-19pack-objects: turn off bitmaps when we split packsJeff King2-0/+10
2014-10-19pack-objects: double-check options before discarding objectsJeff King1-0/+2
2014-10-19repack: pack objects mentioned by the indexJeff King3-0/+22
2014-10-19pack-objects: use argv_arrayJeff King1-10/+10
2014-10-19reachable: use revision machinery's --indexed-objects codeJeff King1-51/+1
2014-10-19rev-list: add --indexed-objects optionJeff King4-0/+80
2014-10-19rev-list: document --reflog optionJeff King1-0/+4
2014-10-19t5516: test pushing a tag of an otherwise unreferenced blobJeff King1-0/+13
2014-10-19traverse_commit_list: support pending blobs/trees with pathsJeff King2-9/+32
2014-10-16Merge branch 'jc/completion-no-chdir'Junio C Hamano1-11/+7
2014-10-16Merge branch 'bw/trace-no-inline-getnanotime'Junio C Hamano1-1/+1
2014-10-16Merge branch 'po/everyday-doc'Junio C Hamano12-131/+185
2014-10-16gitweb: use start_form, not startform that was removed in CGI.pm 4.04Roland Mas1-2/+2
2014-10-16t7610-mergetool: add test cases for mergetool.writeToTempDavid Aguilar1-0/+23
2014-10-16mergetool: add an option for writing to a temporary directoryDavid Aguilar2-4/+37
2014-10-16mergetool: use more conservative temporary filenamesDavid Aguilar1-5/+11
2014-10-16test-lib-functions: adjust style to match CodingGuidelinesDavid Aguilar1-12/+18
2014-10-16t7610-mergetool: use test_config to isolate testsDavid Aguilar1-5/+3
2014-10-16mergetools/meld: make usage of `--output` configurable and more robustDavid Aguilar2-2/+16
2014-10-16make add_object_array_with_context interface more saneJeff King3-20/+15
2014-10-16write_sha1_file: freshen existing objectsJeff King2-7/+71
2014-10-16pack-objects: match prune logic for discarding objectsJeff King4-40/+98
2014-10-16pack-objects: refactor unpack-unreachable expiration checkJeff King1-5/+12
2014-10-16prune: keep objects reachable from recent objectsJeff King5-3/+204
2014-10-16sha1_file: add for_each iterators for loose and packed objectsJeff King2-0/+73
2014-10-16count-objects: use for_each_loose_file_in_objdirJeff King1-71/+30
2014-10-16count-objects: do not use xsize_t when counting object sizeJeff King1-1/+1
2014-10-16prune-packed: use for_each_loose_file_in_objdirJeff King1-46/+23
2014-10-16reachable: mark index blobs as SEENJeff King1-1/+6
2014-10-16prune: factor out loose-object directory traversalJeff King3-61/+143
2014-10-16reachable: reuse revision.c "add all reflogs" codeJeff King3-25/+4
2014-10-16reachable: use traverse_commit_list instead of custom walkJeff King1-113/+17
2014-10-16clean up name allocation in prepare_revision_walkJeff King1-7/+7
2014-10-16object_array: add a "clear" functionJeff King3-6/+17
2014-10-16object_array: factor out slopbuf-freeing logicJeff King1-4/+12
2014-10-16isxdigit: cast input to unsigned charJeff King2-5/+5
2014-10-16foreach_alt_odb: propagate return value from callbackJeff King2-5/+9
2014-10-15contacts: add a Makefile to generate docs and installSebastian Schuberth2-0/+74
2014-10-15subtree: add an install-html targetSebastian Schuberth2-3/+9
2014-10-15difftool: don't assume that default sh is saneCharles Bailey2-5/+5
2014-10-15mergetool: don't require a work tree for --tool-helpCharles Bailey1-1/+4
2014-10-15git-sh-setup: move GIT_DIR initialization into a functionDavid Aguilar1-2/+6
2014-10-15mergetool: use more conservative temporary filenamesDavid Aguilar1-5/+11
2014-10-15test-lib-functions: adjust style to match CodingGuidelinesDavid Aguilar1-12/+18
2014-10-15t7610-mergetool: prefer test_config over git configDavid Aguilar1-11/+9
2014-10-15t7610-mergetool: add missing && and remove commented-out codeDavid Aguilar1-8/+2
2014-10-15t7610-mergetool: use tabs instead of a mix of tabs and spacesDavid Aguilar1-459/+459
2014-10-15Documentation: implement linkgit macro for Asciidoctorbrian m. carlson1-0/+39
2014-10-15Documentation: move some AsciiDoc parameters into variablesbrian m. carlson1-7/+11
2014-10-15ref_transaction_commit: bail out on failure to remove a refJonathan Nieder1-2/+6
2014-10-15lockfile: remove unable_to_lock_errorJonathan Nieder2-11/+0
2014-10-15refs.c: do not permit err == NULLJonathan Nieder1-19/+27
2014-10-15remote rm/prune: print a message when writing packed-refs failsRonnie Sahlberg1-4/+11
2014-10-15for-each-ref: skip and warn about broken ref namesRonnie Sahlberg1-0/+5
2014-10-15refs.c: allow listing and deleting badly named refsRonnie Sahlberg5-38/+273
2014-10-15test: put tests for handling of bad ref names in one placeRonnie Sahlberg3-74/+84
2014-10-15packed-ref cache: forbid dot-components in refnamesJonathan Nieder2-16/+4
2014-10-15branch -d: simplify by using RESOLVE_REF_READINGRonnie Sahlberg1-3/+4
2014-10-15branch -d: avoid repeated symref resolutionJonathan Nieder6-3/+68
2014-10-15reflog test: test interaction with detached HEADJunio C Hamano1-0/+70
2014-10-15refs.c: change resolve_ref_unsafe reading argument to be a flags fieldRonnie Sahlberg28-92/+124
2014-10-15refs.c: make write_ref_sha1 staticRonnie Sahlberg2-5/+8
2014-10-15fetch.c: change s_update_ref to use a ref transactionRonnie Sahlberg1-10/+24
2014-10-15refs.c: ref_transaction_commit: distinguish name conflicts from other errorsRonnie Sahlberg2-12/+23
2014-10-15refs.c: pass a list of names to skip to is_refname_availableRonnie Sahlberg1-18/+32
2014-10-15refs.c: call lock_ref_sha1_basic directly from commitRonnie Sahlberg1-6/+6
2014-10-15refs.c: refuse to lock badly named refs in lock_ref_sha1_basicRonnie Sahlberg1-2/+5
2014-10-15rename_ref: don't ask read_ref_full where the ref came fromRonnie Sahlberg1-1/+1
2014-10-15refs.c: pass the ref log message to _create/delete/update instead of _commitRonnie Sahlberg11-44/+54
2014-10-15refs.c: add an err argument to delete_ref_looseRonnie Sahlberg1-4/+5
2014-10-15wrapper.c: add a new function unlink_or_msgRonnie Sahlberg2-0/+23
2014-10-15refs.c: lock_ref_sha1_basic is used for all refsRonnie Sahlberg1-1/+1
2014-10-15wrapper.c: remove/unlink_or_warn: simplify, treat ENOENT as successRonnie Sahlberg3-11/+12
2014-10-15mv test: recreate mod/ directory instead of relying on stale copyJonathan Nieder1-5/+10
2014-10-14completion: silence "fatal: Not a git repository" errorJohn Szakmeister1-1/+2
2014-10-14color_parse: do not mention variable name in error messageJeff King11-28/+26
2014-10-14pass config slots as pointers instead of offsetsJonathan Nieder5-22/+21
2014-10-14Update draft release notes to 2.2Junio C Hamano1-0/+21
2014-10-14Merge branch 'bc/asciidoc-pretty-formats-fix'Junio C Hamano1-1/+1
2014-10-14Merge branch 'rs/plug-leak-in-bundle'Junio C Hamano1-7/+10
2014-10-14Merge branch 'rs/more-uses-of-skip-prefix'Junio C Hamano10-75/+69
2014-10-14Merge branch 'rs/mailsplit'Junio C Hamano1-1/+0
2014-10-14Merge branch 'rs/sha1-array-test'Junio C Hamano5-2/+130
2014-10-14Merge branch 'mh/lockfile-stdio'Junio C Hamano5-39/+71
2014-10-14Merge branch 'mh/lockfile'Junio C Hamano36-260/+510
2014-10-14Merge branch 'sk/tag-contains-wo-recursion'Junio C Hamano1-2/+2
2014-10-14Merge branch 'da/completion-show-signature'Junio C Hamano1-0/+2
2014-10-14Merge branch 'rs/daemon-fixes'Junio C Hamano1-18/+15
2014-10-14Merge branch 'dt/cache-tree-repair'Junio C Hamano1-1/+1
2014-10-14Merge branch 'so/rebase-doc-fork-point'Junio C Hamano1-12/+19
2014-10-14Merge branch 'da/include-compat-util-first-in-c'Junio C Hamano9-8/+7
2014-10-13test-lib.sh: support -x option for shell-tracingJeff King2-4/+44
2014-10-13t1308: fix broken here document in test scriptJunio C Hamano1-2/+2
2014-10-13Documentation: add documentation for 'git interpret-trailers'Christian Couder2-0/+315
2014-10-13trailer: add tests for commands in config fileChristian Couder1-0/+125
2014-10-13trailer: execute command from 'trailer.<name>.command'Christian Couder1-1/+84
2014-10-13trailer: add tests for "git interpret-trailers"Christian Couder1-0/+738
2014-10-13trailer: add interpret-trailers commandChristian Couder5-0/+48
2014-10-13trailer: put all the processing together and printChristian Couder2-0/+75
2014-10-13trailer: parse trailers from file or stdinChristian Couder1-0/+123
2014-10-13trailer: process command line trailer argumentsChristian Couder1-0/+112
2014-10-13trailer: read and process config informationChristian Couder1-0/+185
2014-10-13trailer: process trailers from input message and argumentsChristian Couder1-0/+210
2014-10-13trailer: add data structures and basic functionsChristian Couder2-0/+70
2014-10-13Documentation: fix mismatched delimiters in git-imap-sendbrian m. carlson1-2/+2
2014-10-13Documentation: adjust document title underliningbrian m. carlson3-3/+3
2014-10-13pack-objects: set number of threads before checking and warningJunio C Hamano2-2/+8
2014-10-13index-pack: fix compilation with NO_PTHREADSEtienne Buira1-0/+3