Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'rj/xdiff-prepare-plug-leak-on-error-codepath' into maint | Junio C Hamano | 2016-04-14 |
|\ | |||
| * | xdiff/xprepare: fix a memory leak | Ramsay Jones | 2016-03-04 |
| * | xdiff/xprepare: use the XDF_DIFF_ALG() macro to access flag bits | Ramsay Jones | 2016-03-04 |
* | | Merge branch 'gf/fetch-pack-direct-object-fetch' into maint | Junio C Hamano | 2016-04-14 |
|\ \ | |||
| * | | fetch-pack: update the documentation for "<refs>..." arguments | Gabriel Souza Franco | 2016-03-05 |
| * | | fetch-pack: fix object_id of exact sha1 | Gabriel Souza Franco | 2016-03-01 |
* | | | Merge branch 'jk/rev-parse-local-env-vars' into maint | Junio C Hamano | 2016-04-14 |
|\ \ \ | |||
| * | | | rev-parse: let some options run outside repository | Jeff King | 2016-02-29 |
| * | | | t1515: add tests for rev-parse out-of-repo helpers | Jeff King | 2016-02-28 |
* | | | | Merge branch 'jk/config-get-urlmatch' into maint | Junio C Hamano | 2016-04-14 |
|\ \ \ \ | |||
| * | | | | Documentation/git-config: fix --get-all description | John Keeping | 2016-02-28 |
| * | | | | Documentation/git-config: use bulleted list for exit codes | John Keeping | 2016-02-28 |
| * | | | | config: fail if --get-urlmatch finds no value | John Keeping | 2016-02-28 |
| |/ / / | |||
* | | | | Merge branch 'pb/t7502-drop-dup' into maint | Junio C Hamano | 2016-04-14 |
|\ \ \ \ | |||
| * | | | | t/t7502 : drop duplicate test | Pranit Bauva | 2016-03-11 |
| | |_|/ | |/| | | |||
* | | | | Merge branch 'jk/test-httpd-config-nosystem' into maint | Junio C Hamano | 2016-04-14 |
|\ \ \ \ | |||
| * | | | | t/lib-httpd: pass through GIT_CONFIG_NOSYSTEM env | Jeff King | 2016-03-18 |
* | | | | | Merge branch 'sb/clone-t57-t56' into maint | Junio C Hamano | 2016-04-14 |
|\ \ \ \ \ | |||
| * | | | | | clone tests: rename t57* => t56* | Stefan Beller | 2016-03-16 |
* | | | | | | Merge branch 'jk/credential-cache-comment-exit' into maint | Junio C Hamano | 2016-04-14 |
|\ \ \ \ \ \ | |||
| * | | | | | | credential-cache--daemon: clarify "exit" action semantics | Jeff King | 2016-03-18 |
| | |/ / / / | |/| | | | | |||
* | | | | | | Merge branch 'jc/index-pack' into maint | Junio C Hamano | 2016-04-14 |
|\ \ \ \ \ \ | |||
| * | | | | | | index-pack: add a helper function to derive .idx/.keep filename | Junio C Hamano | 2016-03-03 |
| * | | | | | | Merge branch 'jc/maint-index-pack-keep' into jc/index-pack | Junio C Hamano | 2016-03-03 |
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | |||
| | * | | | | | index-pack: correct --keep[=<msg>] | Junio C Hamano | 2016-03-03 |
* | | | | | | | Merge branch 'ss/exc-flag-is-a-collection-of-bits' into maint | Junio C Hamano | 2016-04-14 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | dir: store EXC_FLAG_* values in unsigned integers | Saurav Sachidanand | 2016-03-01 |
| | |_|_|_|/ / | |/| | | | | | |||
* | | | | | | | Merge branch 'mp/upload-pack-use-embedded-args' into maint | Junio C Hamano | 2016-04-14 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | upload-pack: use argv_array for pack_objects | Michael Procter | 2016-02-25 |
| | |_|_|_|_|/ | |/| | | | | | |||
* | | | | | | | Merge branch 'oa/doc-diff-check' into maint | Junio C Hamano | 2016-04-14 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | Documentation: git diff --check detects conflict markers | Ori Avtalion | 2016-03-29 |
* | | | | | | | | Merge branch 'pb/opt-cmdmode-doc' into maint | Junio C Hamano | 2016-04-14 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | api-parse-options.txt: document OPT_CMDMODE() | Pranit Bauva | 2016-03-25 |
| |/ / / / / / / | |||
* | | | | | | | | Merge branch 'nd/apply-doc' into maint | Junio C Hamano | 2016-04-14 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | git-apply.txt: mention the behavior inside a subdir | Nguyễn Thái Ngọc Duy | 2016-03-24 |
| * | | | | | | | | git-apply.txt: remove a space | Nguyễn Thái Ngọc Duy | 2016-03-24 |
| |/ / / / / / / | |||
* | | | | | | | | Merge branch 'cc/doc-recommend-performance-trace-to-file' into maint | Junio C Hamano | 2016-04-14 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | Documentation: talk about pager in api-trace.txt | Christian Couder | 2016-03-07 |
* | | | | | | | | | Merge branch 'mm/lockfile-error-message' into maint | Junio C Hamano | 2016-04-14 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | lockfile: improve error message when lockfile exists | Matthieu Moy | 2016-03-01 |
| * | | | | | | | | | lockfile: mark strings for translation | Matthieu Moy | 2016-03-01 |
| | |_|_|_|/ / / / | |/| | | | | | | | |||
* | | | | | | | | | Start preparing for 2.8.2 | Junio C Hamano | 2016-04-13 |
* | | | | | | | | | Git 2.8.1v2.8.1 | Junio C Hamano | 2016-04-03 |
* | | | | | | | | | Merge branch 'mm/readme-markdown' into maint | Junio C Hamano | 2016-04-03 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | git.spec.in: use README.md, not README | Matthieu Moy | 2016-04-03 |
* | | | | | | | | | | Git 2.8v2.8.0 | Junio C Hamano | 2016-03-28 |
* | | | | | | | | | | Merge branch 'ls/p4-doc-markup' | Junio C Hamano | 2016-03-24 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | Documentation: fix git-p4 AsciiDoc formatting | Lars Schneider | 2016-03-23 |
| * | | | | | | | | | | Documentation: use ASCII quotation marks in git-p4 | Lars Schneider | 2016-03-21 |
| | |_|_|_|_|_|_|/ / | |/| | | | | | | | | |||
* | | | | | | | | | | Merge branch 'js/mingw-tests-2.8' | Junio C Hamano | 2016-03-24 |
|\ \ \ \ \ \ \ \ \ \ |