summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2015-05-18Documentation/log: clarify what --raw meansLibravatar Matthieu Moy1-1/+10
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-18sha1_file: pass empty buffer to index empty fileLibravatar Jim Hill2-1/+27
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-15http-backend: fix die recursion with custom handlerLibravatar Jeff King1-5/+9
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
2015-05-12Merge branch 'mh/write-refs-sooner-2.3' into mh/write-refs-sooner-2.4Libravatar Junio C Hamano0-0/+0
2015-05-12ref_transaction_commit(): fix atomicity and avoid fd exhaustionLibravatar Michael Haggerty2-23/+55
2015-05-12ref_transaction_commit(): remove the local flags variableLibravatar Michael Haggerty1-9/+9
2015-05-12ref_transaction_commit(): inline call to write_ref_sha1()Libravatar Michael Haggerty1-18/+7
2015-05-12rename_ref(): inline calls to write_ref_sha1() from this functionLibravatar Michael Haggerty1-4/+8
2015-05-12commit_ref_update(): new function, extracted from write_ref_sha1()Libravatar Michael Haggerty1-7/+20
2015-05-12write_ref_to_lockfile(): new function, extracted from write_ref_sha1()Libravatar Michael Haggerty1-4/+17
2015-05-12t7004: rename ULIMIT test prerequisite to ULIMIT_STACK_SIZELibravatar Stefan Beller1-2/+2
2015-05-12update-ref: test handling large transactions properlyLibravatar Stefan Beller1-0/+28
2015-05-12Merge branch 'mh/write-refs-sooner-2.2' into mh/write-refs-sooner-2.3Libravatar Junio C Hamano3-28/+103
2015-05-12ref_transaction_commit(): fix atomicity and avoid fd exhaustionLibravatar Michael Haggerty2-12/+47
2015-05-12ref_transaction_commit(): remove the local flags variableLibravatar Michael Haggerty1-4/+3
2015-05-12ref_transaction_commit(): inline call to write_ref_sha1()Libravatar Michael Haggerty1-28/+10
2015-05-12rename_ref(): inline calls to write_ref_sha1() from this functionLibravatar Michael Haggerty1-4/+8
2015-05-12commit_ref_update(): new function, extracted from write_ref_sha1()Libravatar Michael Haggerty1-16/+29