summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
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-22commit doc: document that -c, -C, -F and --fixup with -m errorLibravatar Ævar Arnfjörð Bjarmason1-0/+3
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
2017-12-18imap-send: URI encode server folderLibravatar Nicolas Morey-Chaisemartin1-1/+7
2017-12-14version --build-options: report commit, too, if possibleLibravatar Johannes Schindelin4-1/+10
2017-12-14version --build-options: also report host CPULibravatar Eric Sunshine2-0/+10
2017-12-14transport: make transport vtable more privateLibravatar Jonathan Tan4-87/+120
2017-12-14clone, fetch: remove redundant transport checkLibravatar Jonathan Tan2-6/+0
2017-12-14partial-clone: design docLibravatar Jeff Hostetler1-0/+324
2017-12-14RelNotes: minor typo fixes in 2.16.0 draftLibravatar Todd Zullinger1-2/+2
2017-12-14t/lib-git-svn.sh: improve svnserve tests with parallel make testLibravatar Todd Zullinger1-2/+4
2017-12-14t/lib-git-svn: cleanup inconsistent tab/space usageLibravatar Todd Zullinger1-11/+11
2017-12-14Merge branch 'svn-crlf' of git://bogomips.org/git-svn into ew/svn-crlfLibravatar Junio C Hamano2-0/+28
2017-12-14git-svn: convert CRLF to LF in commit message to SVNLibravatar Eric Wong2-0/+28
2017-12-13RelNotes: the ninth batchLibravatar Junio C Hamano1-0/+31
2017-12-13Merge branch 'js/hashmap-update-sample'Libravatar Junio C Hamano1-31/+29
2017-12-13Merge branch 'en/remove-stripspace'Libravatar Junio C Hamano1-9/+0
2017-12-13Merge branch 'jk/no-optional-locks'Libravatar Junio C Hamano1-0/+13
2017-12-13Merge branch 'ds/for-each-file-in-obj-micro-optim'Libravatar Junio C Hamano2-5/+11
2017-12-13Merge branch 'jk/progress-delay-fix'Libravatar Junio C Hamano1-19/+5
2017-12-13Merge branch 'ks/doc-checkout-previous'Libravatar Junio C Hamano1-4/+4
2017-12-13Merge branch 'fk/sendmail-from-path'Libravatar Junio C Hamano2-4/+6
2017-12-13Merge branch 'tg/t-readme-updates'Libravatar Junio C Hamano1-4/+6
2017-12-13Merge branch 'pc/submodule-helper'Libravatar Junio C Hamano1-1/+1