summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2014-10-24Merge branch 'wk/t1304-wo-USER'Libravatar Junio C Hamano1-1/+1
2014-10-24Merge branch 'tb/core-filemode-doc'Libravatar Junio C Hamano1-6/+19
2014-10-24Merge branch 'rs/run-command-env-array'Libravatar Junio C Hamano8-39/+38
2014-10-24Merge branch 'po/doc-status-markup'Libravatar Junio C Hamano1-2/+2
2014-10-24Merge branch 'jk/pack-objects-no-bitmap-when-splitting'Libravatar Junio C Hamano2-0/+10
2014-10-21Update draft release notes to 2.2Libravatar Junio C Hamano1-4/+17
2014-10-21Merge branch 'js/completion-hide-not-a-repo'Libravatar Junio C Hamano1-1/+2
2014-10-21Merge branch 'da/mergetool-meld'Libravatar Junio C Hamano2-2/+16
2014-10-21Merge branch 'da/mergetool-temporary-directory'Libravatar Junio C Hamano3-4/+60
2014-10-21Merge branch 'da/mergetool-tool-help'Libravatar Junio C Hamano4-14/+21
2014-10-21Merge branch 'da/mergetool-temporary-filename'Libravatar Junio C Hamano1-5/+11
2014-10-21Merge branch 'da/mergetool-tests'Libravatar Junio C Hamano2-471/+469
2014-10-21Merge branch 'rs/ref-transaction'Libravatar Junio C Hamano45-350/+849
2014-10-20Update draft release notes to 2.2Libravatar Junio C Hamano1-5/+17
2014-10-20Merge branch 'cc/interpret-trailers'Libravatar Junio C Hamano10-0/+2084
2014-10-20Merge branch 'rm/gitweb-start-form'Libravatar Junio C Hamano1-2/+2
2014-10-20Merge branch 'ss/contrib-subtree-contacts'Libravatar Junio C Hamano4-3/+83
2014-10-20Merge branch 'jn/parse-config-slot'Libravatar Junio C Hamano13-50/+47
2014-10-20Merge branch 'rs/receive-pack-argv-leak-fix'Libravatar Junio C Hamano1-10/+8
2014-10-20Merge branch 'ta/config-set'Libravatar Junio C Hamano1-2/+2
2014-10-20Merge branch 'jk/test-shell-trace'Libravatar Junio C Hamano4-35/+84
2014-10-20Merge branch 'bc/asciidoc'Libravatar Junio C Hamano4-5/+5
2014-10-20Revert "archive: honor tar.umask even for pax headers"Libravatar Junio C Hamano2-7/+2
2014-10-19core.filemode may need manual actionLibravatar Torsten Bögershausen1-6/+19
2014-10-19doc: fix 'git status --help' character quotingLibravatar Philip Oakley1-2/+2
2014-10-19t1304: Set LOGNAME even if USER is unset or nullLibravatar W. Trevor King1-1/+1
2014-10-19use env_array member of struct child_processLibravatar René Scharfe5-38/+25
2014-10-19run-command: add env_array, an optional argv_array for envLibravatar René Scharfe3-1/+13
2014-10-19pack-objects: turn off bitmaps when we split packsLibravatar Jeff King2-0/+10
2014-10-16Merge branch 'jc/completion-no-chdir'Libravatar Junio C Hamano1-11/+7
2014-10-16Merge branch 'bw/trace-no-inline-getnanotime'Libravatar Junio C Hamano1-1/+1
2014-10-16Merge branch 'po/everyday-doc'Libravatar Junio C Hamano12-131/+185
2014-10-16gitweb: use start_form, not startform that was removed in CGI.pm 4.04Libravatar Roland Mas1-2/+2
2014-10-16t7610-mergetool: add test cases for mergetool.writeToTempLibravatar David Aguilar1-0/+23
2014-10-16mergetool: add an option for writing to a temporary directoryLibravatar David Aguilar2-4/+37
2014-10-16mergetool: use more conservative temporary filenamesLibravatar David Aguilar1-5/+11
2014-10-16test-lib-functions: adjust style to match CodingGuidelinesLibravatar David Aguilar1-12/+18
2014-10-16t7610-mergetool: use test_config to isolate testsLibravatar David Aguilar1-5/+3
2014-10-16mergetools/meld: make usage of `--output` configurable and more robustLibravatar David Aguilar2-2/+16
2014-10-15contacts: add a Makefile to generate docs and installLibravatar Sebastian Schuberth2-0/+74
2014-10-15subtree: add an install-html targetLibravatar Sebastian Schuberth2-3/+9
2014-10-15difftool: don't assume that default sh is saneLibravatar Charles Bailey2-5/+5
2014-10-15mergetool: don't require a work tree for --tool-helpLibravatar Charles Bailey1-1/+4
2014-10-15git-sh-setup: move GIT_DIR initialization into a functionLibravatar David Aguilar1-2/+6
2014-10-15mergetool: use more conservative temporary filenamesLibravatar David Aguilar1-5/+11
2014-10-15test-lib-functions: adjust style to match CodingGuidelinesLibravatar David Aguilar1-12/+18
2014-10-15t7610-mergetool: prefer test_config over git configLibravatar David Aguilar1-11/+9
2014-10-15t7610-mergetool: add missing && and remove commented-out codeLibravatar David Aguilar1-8/+2
2014-10-15t7610-mergetool: use tabs instead of a mix of tabs and spacesLibravatar David Aguilar1-459/+459
2014-10-15ref_transaction_commit: bail out on failure to remove a refLibravatar Jonathan Nieder1-2/+6