aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'pt/pull-ff-vs-merge-ff' into maintJunio C Hamano2015-06-05
|\
| * pull: parse pull.ff as a bool or stringPaul Tan2015-05-18
| * pull: make pull.ff=true override merge.ffPaul Tan2015-05-18
* | Merge branch 'rs/plug-leak-in-pack-bitmaps' into maintJunio C Hamano2015-06-05
|\ \
| * | pack-bitmaps: plug memory leak, fix allocation size for recent_bitmapsRené Scharfe2015-05-19
* | | Merge branch 'ja/tutorial-asciidoctor-fix' into maintJunio C Hamano2015-06-05
|\ \ \
| * | | doc: fix unmatched code fencesJean-Noel Avila2015-05-12
* | | | Merge branch 'jk/stripspace-asciidoctor-fix' into maintJunio C Hamano2015-06-05
|\ \ \ \
| * | | | doc: fix unmatched code fences in git-stripspaceJeff King2015-05-12
| |/ / /
* | | | Merge branch 'jk/asciidoc-markup-fix' into maintJunio C Hamano2015-06-05
|\ \ \ \
| * | | | doc: convert AsciiDoc {?foo} to ifdef::foo[]Jeff King2015-05-14
| * | | | doc: put example URLs and emails inside literal backticksJeff King2015-05-12
| * | | | doc: drop backslash quoting of some curly bracesJeff King2015-05-12
| * | | | doc: convert \--option to --optionJeff King2015-05-12
| * | | | doc/add: reformat `--edit` optionJeff King2015-05-12
| * | | | doc: fix length of underlined section-titleJeff King2015-05-12
| * | | | doc: fix hanging "+"-continuationJeff King2015-05-12
| * | | | doc: fix unquoted use of "{type}"Jeff King2015-05-12
| * | | | doc: fix misrendering due to `single quote'Jeff King2015-05-12
* | | | | Merge branch 'ps/bundle-verify-arg' into maintJunio C Hamano2015-06-05
|\ \ \ \ \
| * | | | | bundle: verify arguments more strictlyPatrick Steinhardt2015-05-08
| | |/ / / | |/| | |
* | | | | Merge branch 'mh/write-refs-sooner-2.4' into maintJunio C Hamano2015-06-05
|\ \ \ \ \
| * \ \ \ \ Merge branch 'mh/write-refs-sooner-2.3' into mh/write-refs-sooner-2.4Junio C Hamano2015-05-12
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'mh/write-refs-sooner-2.2' into mh/write-refs-sooner-2.3Junio C Hamano2015-05-12
| | |\ \ \ \ \
| | | * | | | | ref_transaction_commit(): fix atomicity and avoid fd exhaustionMichael Haggerty2015-05-12
| | | * | | | | ref_transaction_commit(): remove the local flags variableMichael Haggerty2015-05-12
| | | * | | | | ref_transaction_commit(): inline call to write_ref_sha1()Michael Haggerty2015-05-12
| | | * | | | | rename_ref(): inline calls to write_ref_sha1() from this functionMichael Haggerty2015-05-12
| | | * | | | | commit_ref_update(): new function, extracted from write_ref_sha1()Michael Haggerty2015-05-12
| | | * | | | | write_ref_to_lockfile(): new function, extracted from write_ref_sha1()Michael Haggerty2015-05-12
| | | * | | | | t7004: rename ULIMIT test prerequisite to ULIMIT_STACK_SIZEStefan Beller2015-05-12
| | | * | | | | update-ref: test handling large transactions properlyStefan Beller2015-05-10
| * | | | | | | ref_transaction_commit(): fix atomicity and avoid fd exhaustionMichael Haggerty2015-05-12
| * | | | | | | ref_transaction_commit(): remove the local flags variableMichael Haggerty2015-05-12
| * | | | | | | ref_transaction_commit(): inline call to write_ref_sha1()Michael Haggerty2015-05-12
| * | | | | | | rename_ref(): inline calls to write_ref_sha1() from this functionMichael Haggerty2015-05-12
| * | | | | | | commit_ref_update(): new function, extracted from write_ref_sha1()Michael Haggerty2015-05-12
| * | | | | | | write_ref_to_lockfile(): new function, extracted from write_ref_sha1()Michael Haggerty2015-05-12
| * | | | | | | t7004: rename ULIMIT test prerequisite to ULIMIT_STACK_SIZEStefan Beller2015-05-12
| * | | | | | | update-ref: test handling large transactions properlyStefan Beller2015-05-12
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'mh/ref-directory-file' into maintJunio C Hamano2015-06-05
|\ \ \ \ \ \ \
| * | | | | | | reflog_expire(): integrate lock_ref_sha1_basic() errors into oursMichael Haggerty2015-05-11
| * | | | | | | ref_transaction_commit(): delete extra "the" from error messageMichael Haggerty2015-05-11
| * | | | | | | ref_transaction_commit(): provide better error messagesMichael Haggerty2015-05-11
| * | | | | | | rename_ref(): integrate lock_ref_sha1_basic() errors into oursMichael Haggerty2015-05-11
| * | | | | | | lock_ref_sha1_basic(): improve diagnostics for ref D/F conflictsMichael Haggerty2015-05-11
| * | | | | | | lock_ref_sha1_basic(): report errors via a "struct strbuf *err"Michael Haggerty2015-05-11
| * | | | | | | verify_refname_available(): report errors via a "struct strbuf *err"Michael Haggerty2015-05-11
| * | | | | | | verify_refname_available(): rename functionMichael Haggerty2015-05-11
| * | | | | | | refs: check for D/F conflicts among refs created in a transactionMichael Haggerty2015-05-11