summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2017-12-28Merge branch 'cc/skip-to-optional-val'Libravatar Junio C Hamano5-90/+126
2017-12-28Merge branch 'ra/prompt-eread-fix'Libravatar Junio C Hamano1-3/+4
2017-12-28Merge branch 'bw/path-doc'Libravatar Junio C Hamano1-21/+112
2017-12-28Makefile: NO_OPENSSL=1 should no longer imply BLK_SHA1=1Libravatar Ævar Arnfjörð Bjarmason2-3/+0
2017-12-27sequencer: do not invent whitespace when transforming OIDsLibravatar Johannes Schindelin1-1/+4
2017-12-27sequencer: report when noop has an argumentLibravatar Johannes Schindelin1-4/+9
2017-12-27sequencer: remove superfluous conditionalLibravatar Johannes Schindelin1-3/+1
2017-12-27sequencer: strip bogus LF at end of error messagesLibravatar Johannes Schindelin1-4/+4
2017-12-27rebase: do not continue when the todo list generation failedLibravatar Johannes Schindelin1-1/+2
2017-12-27travis-ci: only print test failures if there are test results availableLibravatar SZEDER Gábor1-0/+6
2017-12-27travis-ci: save prove state for the 32 bit Linux buildLibravatar SZEDER Gábor2-0/+2
2017-12-27travis-ci: don't install default addon packages for the 32 bit Linux buildLibravatar SZEDER Gábor1-0/+1
2017-12-27travis-ci: fine tune the use of 'set -x' in 'ci/*' scriptsLibravatar SZEDER Gábor4-1/+13
2017-12-27RelNotes: the eleventh batchLibravatar Junio C Hamano1-0/+41
2017-12-27Merge branch 'rb/quick-install-doc'Libravatar Junio C Hamano2-6/+8
2017-12-27Merge branch 'jt/transport-no-more-rsync'Libravatar Junio C Hamano2-9/+1
2017-12-27Merge branch 'sg/travis-fixes'Libravatar Junio C Hamano3-29/+39
2017-12-27Merge branch 'sb/test-helper-excludes'Libravatar Junio C Hamano1-41/+5
2017-12-27Merge branch 'ot/pretty'Libravatar Junio C Hamano6-84/+136
2017-12-27Merge branch 'bw/submodule-sans-cache-compat'Libravatar Junio C Hamano5-23/+31
2017-12-27Merge branch 'es/clone-shared-worktree'Libravatar Junio C Hamano2-1/+8
2017-12-27Merge branch 'tb/delimit-pretty-trailers-args-with-comma'Libravatar Junio C Hamano1-5/+7
2017-12-27Merge branch 'rs/fmt-merge-msg-leakfix'Libravatar Junio C Hamano1-2/+5
2017-12-27Merge branch 'jt/decorate-api'Libravatar Junio C Hamano8-25/+146
2017-12-27Merge branch 'jk/cvsimport-quoting'Libravatar Junio C Hamano1-1/+1
2017-12-27Merge branch 'db/doc-workflows-neuter-the-maintainer'Libravatar Junio C Hamano1-2/+2
2017-12-27Merge branch 'ks/branch-cleanup'Libravatar Junio C Hamano4-11/+24
2017-12-27Merge branch 'rs/strbuf-read-once-reset-length'Libravatar Junio C Hamano1-0/+3
2017-12-27Merge branch 'rs/fmt-merge-msg-string-leak-fix'Libravatar Junio C Hamano1-1/+2
2017-12-27Merge branch 'rs/am-builtin-leakfix'Libravatar Junio C Hamano1-3/+7
2017-12-27Merge branch 'es/worktree-checkout-hook'Libravatar Junio C Hamano3-7/+47
2017-12-27Merge branch 'lb/rebase-i-short-command-names'Libravatar Junio C Hamano8-126/+186
2017-12-27Merge branch 'tb/check-crlf-for-safe-crlf'Libravatar Junio C Hamano2-10/+86
2017-12-27Merge branch 'jh/object-filtering'Libravatar Junio C Hamano20-53/+1735
2017-12-27sequencer.c: drop 'const' from function return typeLibravatar Junio C Hamano1-1/+1
2017-12-22strbuf: fix urlencode format string on signed charLibravatar Julien Dusser1-1/+1
2017-12-22send-pack: use internal argv_array of struct child_processLibravatar René Scharfe1-19/+9
2017-12-22http: use internal argv_array of struct child_processLibravatar René Scharfe1-8/+3
2017-12-22git-p4: update multiple shelved change listsLibravatar Luke Diamand3-26/+47
2017-12-22check-non-portable-shell.pl: `wc -l` may have leading WSLibravatar Torsten Bögershausen1-0/+1
2017-12-22config.txt: document behavior of backslashes in subsectionsLibravatar Dave Borowitz1-5/+7
2017-12-22Merge branch 'ew/empty-merge-with-dirty-index-maint' into ew/empty-merge-with...Libravatar Junio C Hamano5-42/+70
2017-12-22merge-recursive: avoid incorporating uncommitted changes in a mergeLibravatar Elijah Newren2-1/+8
2017-12-22move index_has_changes() from builtin/am.c to merge.c for reuseLibravatar Elijah Newren3-37/+42
2017-12-22t6044: recursive can silently incorporate dirty changes in a mergeLibravatar Elijah Newren1-5/+21
2017-12-22t/helper/test-lazy-name-hash: fix compilationLibravatar Stefan Beller1-1/+1
2017-12-19t5573, t7612: clean up after unexpected success of 'pull' and 'merge'Libravatar Junio C Hamano2-8/+17
2017-12-19RelNotes: the tenth batchLibravatar Junio C Hamano1-0/+46
2017-12-19Merge branch 'ls/editor-waiting-message'Libravatar Junio C Hamano7-7/+41
2017-12-19Merge branch 'sg/setup-doc-update'Libravatar Junio C Hamano1-1/+1