summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2015-05-19Third batch for 2.5 cycleLibravatar Junio C Hamano1-0/+81
2015-05-19Merge branch 'sb/ref-lock-lose-lock-fd'Libravatar Junio C Hamano1-10/+5
2015-05-19Merge branch 'kn/cat-file-literally'Libravatar Junio C Hamano5-43/+188
2015-05-19Merge branch 'nd/dwim-wildcards-as-pathspecs'Libravatar Junio C Hamano1-1/+3
2015-05-19Merge branch 'jc/merge'Libravatar Junio C Hamano10-112/+324
2015-05-19Merge branch 'ph/rebase-i-redo'Libravatar Junio C Hamano2-0/+63
2015-05-19Merge branch 'jc/test-prereq-validate'Libravatar Junio C Hamano1-0/+9
2015-05-19Merge branch 'bc/connect-plink'Libravatar Junio C Hamano2-22/+67
2015-05-19Merge branch 'jk/test-chain-lint'Libravatar Junio C Hamano2-2/+2
2015-05-19Merge branch 'fg/document-commit-message-stripping'Libravatar Junio C Hamano1-4/+7
2015-05-19Merge branch 'jk/stash-require-clean-index'Libravatar Junio C Hamano2-7/+16
2015-05-19Merge branch 'jk/git-no-more-argv0-path-munging'Libravatar Junio C Hamano1-1/+0
2015-05-19Merge branch 'jc/gitignore-precedence'Libravatar Junio C Hamano2-3/+17
2015-05-19Merge branch 'nd/diff-i-t-a'Libravatar Junio C Hamano4-8/+38
2015-05-19progress: treat "no terminal" as being in the foregroundLibravatar Jeff King1-1/+2
2015-05-19pack-bitmaps: plug memory leak, fix allocation size for recent_bitmapsLibravatar René Scharfe1-5/+3
2015-05-19clone: call transport_set_verbosity before anything else on the newly created...Libravatar Mike Hommey1-2/+2
2015-05-18subdirectory tests: code cleanup, uncomment testLibravatar Stefan Beller1-4/+7
2015-05-18pull: parse pull.ff as a bool or stringLibravatar Paul Tan1-1/+1
2015-05-18pull: make pull.ff=true override merge.ffLibravatar Paul Tan3-1/+12
2015-05-18pull: handle --log=<n>Libravatar Paul Tan2-2/+19
2015-05-17pack-protocol.txt: fix insconsistent spelling of "packfile"Libravatar Patrick Steinhardt1-3/+3
2015-05-17git-unpack-objects.txt: fix inconsistent spelling of "packfile"Libravatar Patrick Steinhardt1-2/+2
2015-05-17git-verify-pack.txt: fix inconsistent spelling of "packfile"Libravatar Patrick Steinhardt1-1/+1
2015-05-14lock_packed_refs(): allow retries when acquiring the packed-refs lockLibravatar Michael Haggerty3-1/+34
2015-05-14lockfile: allow file locking to be retried with a timeoutLibravatar Michael Haggerty2-4/+91
2015-05-14rerere: exit silently on "forget" when rerere is disabledLibravatar Jeff King1-0/+2
2015-05-14pull: remove --tags error in no merge candidates caseLibravatar Paul Tan1-9/+0
2015-05-14doc: convert AsciiDoc {?foo} to ifdef::foo[]Libravatar Jeff King1-2/+6
2015-05-13Sync with 2.4.1Libravatar Junio C Hamano2-1/+42
2015-05-13Git 2.4.1Libravatar Junio C Hamano4-3/+44
2015-05-13Merge branch 'sb/line-log-plug-pairdiff-leak' into maintLibravatar Junio C Hamano1-0/+1
2015-05-13Merge branch 'sb/test-bitmap-free-at-end' into maintLibravatar Junio C Hamano1-0/+2
2015-05-13Merge branch 'nd/t1509-chroot-test' into maintLibravatar Junio C Hamano1-9/+29
2015-05-13Merge branch 'jk/type-from-string-gently' into maintLibravatar Junio C Hamano2-1/+10
2015-05-13Merge branch 'ep/fix-test-lib-functions-report' into maintLibravatar Junio C Hamano1-2/+2
2015-05-13Merge branch 'cn/bom-in-gitignore' into maintLibravatar Junio C Hamano6-5/+39
2015-05-13Merge branch 'jk/prune-mtime' into maintLibravatar Junio C Hamano3-9/+26
2015-05-13Merge branch 'jk/init-core-worktree-at-root' into maintLibravatar Junio C Hamano1-3/+15
2015-05-13log: do not shorten decoration names too earlyLibravatar Junio C Hamano1-18/+16
2015-05-13log: decorate HEAD with branch name under --decorate=full, tooLibravatar Junio C Hamano2-6/+19
2015-05-12doc: put example URLs and emails inside literal backticksLibravatar Jeff King3-5/+5
2015-05-12doc: drop backslash quoting of some curly bracesLibravatar Jeff King1-7/+7
2015-05-12doc: convert \--option to --optionLibravatar Jeff King11-80/+80
2015-05-12doc/add: reformat `--edit` optionLibravatar Jeff King1-1/+2
2015-05-12doc: fix length of underlined section-titleLibravatar Jeff King1-1/+1
2015-05-12doc: fix hanging "+"-continuationLibravatar Jeff King1-3/+3
2015-05-12doc: fix unquoted use of "{type}"Libravatar Jeff King1-1/+1
2015-05-12doc: fix misrendering due to `single quote'Libravatar Jeff King2-2/+2
2015-05-12doc: fix unmatched code fences in git-stripspaceLibravatar Jeff King1-3/+3