summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
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
2017-12-19Merge branch 'ar/unconfuse-three-dots'Libravatar Junio C Hamano25-24/+458
2017-12-19Merge branch 'tg/worktree-create-tracking'Libravatar Junio C Hamano8-51/+277
2017-12-19Merge branch 'gk/tracing-optimization'Libravatar Junio C Hamano2-40/+48
2017-12-19Merge branch 'bw/submodule-config-cleanup'Libravatar Junio C Hamano2-0/+19
2017-12-19Merge branch 'sb/clone-recursive-submodule-doc'Libravatar Junio C Hamano1-8/+11
2017-12-19Merge branch 'ls/git-gui-no-double-utf8-author-name'Libravatar Junio C Hamano1-3/+9
2017-12-19Merge branch 'bw/pathspec-match-submodule-boundary'Libravatar Junio C Hamano4-2/+24
2017-12-19Merge branch 'jt/diff-anchored-patience'Libravatar Junio C Hamano6-7/+169
2017-12-19Merge branch 'en/merge-recursive-icase-removal'Libravatar Junio C Hamano1-1/+1
2017-12-19Merge branch 'en/rename-progress'Libravatar Junio C Hamano6-27/+44
2017-12-19builtin/describe.c: describe a blobLibravatar Stefan Beller3-7/+107
2017-12-19http: support CURLPROXY_HTTPSLibravatar Wei Shuyu1-0/+5
2017-12-19rebase: rebasing can also be done when HEAD is detachedLibravatar Kaartic Sivaraam1-2/+14
2017-12-19rebase: distinguish user input by quoting itLibravatar Kaartic Sivaraam1-2/+2
2017-12-19rebase: consistently use branch_name variableLibravatar Kaartic Sivaraam1-7/+10
2017-12-19Doc/check-ref-format: clarify information about @{-N} syntaxLibravatar Kaartic Sivaraam1-7/+12
2017-12-18config: document default value of http.sslVerifyLibravatar Simon Ruderich1-2/+2
2017-12-18p7519: improve check for prerequisite WATCHMANLibravatar René Scharfe1-2/+1