Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'jm/format-patch-mail-sig' | Junio C Hamano | 2014-06-16 |
|\ | |||
| * | format-patch: add "--signature-file=<file>" option | Jeremiah Mahler | 2014-05-27 |
* | | Merge branch 'jk/http-errors' | Junio C Hamano | 2014-06-16 |
|\ \ | |||
| * | | strbuf: add strbuf_reencode helper | Jeff King | 2014-05-27 |
* | | | Merge branch 'fc/remote-helper-refmap' | Junio C Hamano | 2014-06-16 |
|\ \ \ | |||
| * | | | fast-import: add support to delete refs | Felipe Contreras | 2014-04-21 |
| * | | | fast-export: add new --refspec option | Felipe Contreras | 2014-04-21 |
* | | | | Merge branch 'jl/status-added-submodule-is-never-ignored' | Junio C Hamano | 2014-06-16 |
|\ \ \ \ | |||
| * | | | | status/commit: show staged submodules regardless of ignore config | Jens Lehmann | 2014-04-07 |
* | | | | | Merge branch 'jk/strbuf-tolower' | Junio C Hamano | 2014-06-16 |
|\ \ \ \ \ | |||
| * | | | | | strbuf: add strbuf_tolower function | Jeff King | 2014-05-23 |
| | |_|/ / | |/| | | | |||
* | | | | | Merge branch 'jk/argv-array-for-child-process' | Junio C Hamano | 2014-06-16 |
|\ \ \ \ \ | |||
| * | | | | | argv-array: drop "detach" code | Jeff King | 2014-05-15 |
| * | | | | | run-command: store an optional argv_array | Jeff King | 2014-05-15 |
* | | | | | | Merge branch 'cc/replace-edit' | Junio C Hamano | 2014-06-16 |
|\ \ \ \ \ \ | |||
| * | | | | | | Documentation: replace: describe new --edit option | Christian Couder | 2014-05-19 |
* | | | | | | | Merge branch 'mt/patch-id-stable' (early part) | Junio C Hamano | 2014-06-16 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | patch-id: make it stable against hunk reordering | Michael S. Tsirkin | 2014-06-10 |
| | |_|_|/ / / | |/| | | | | | |||
* | | | | | | | Update draft release notes to 2.1 | Junio C Hamano | 2014-06-09 |
* | | | | | | | Second batch for 2.1 | Junio C Hamano | 2014-06-06 |
* | | | | | | | Merge branch 'ss/howto-manage-trunk' | Junio C Hamano | 2014-06-06 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | How to keep a project's canonical history correct. | Stephen P. Smith | 2014-05-28 |
* | | | | | | | | Merge branch 'jj/command-line-adjective' | Junio C Hamano | 2014-06-06 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | Documentation: use "command-line" when used as a compound adjective, and fix ... | Jason St. John | 2014-05-21 |
| | |_|_|_|_|_|/ | |/| | | | | | | |||
* | | | | | | | | Merge branch 'jc/coding-guidelines' | Junio C Hamano | 2014-06-06 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | CodingGuidelines: avoid "test <cond> -a/-o <cond>" | Junio C Hamano | 2014-05-20 |
| * | | | | | | | | CodingGuidelines: on splitting a long line | Junio C Hamano | 2014-05-02 |
| * | | | | | | | | CodingGuidelines: on comparison | Junio C Hamano | 2014-05-02 |
| * | | | | | | | | CodingGuidelines: do not call the conditional statement "if()" | Junio C Hamano | 2014-05-02 |
| * | | | | | | | | CodingGuidelines: give an example for shell function preamble | Junio C Hamano | 2014-05-02 |
| * | | | | | | | | CodingGuidelines: give an example for control statements | Junio C Hamano | 2014-05-02 |
| * | | | | | | | | CodingGuidelines: give an example for redirection | Junio C Hamano | 2014-05-02 |
| * | | | | | | | | CodingGuidelines: give an example for case/esac statement | Junio C Hamano | 2014-05-02 |
| * | | | | | | | | CodingGuidelines: once it is in, it is not worth the code churn | Junio C Hamano | 2014-05-02 |
| | |_|_|/ / / / | |/| | | | | | | |||
* | | | | | | | | Merge branch 'nd/status-auto-comment-char' | Junio C Hamano | 2014-06-06 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | commit: allow core.commentChar=auto for character auto selection | Nguyễn Thái Ngọc Duy | 2014-05-19 |
| | |_|_|_|/ / / | |/| | | | | | | |||
* | | | | | | | | Merge branch 'wk/doc-clarify-upstream' | Junio C Hamano | 2014-06-06 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | Documentation: mention config sources for @{upstream} | W. Trevor King | 2014-05-13 |
* | | | | | | | | | Merge branch 'dk/raise-core-deltabasecachelimit' | Junio C Hamano | 2014-06-06 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | Bump core.deltaBaseCacheLimit to 96m | David Kastrup | 2014-05-06 |
| | |_|_|_|/ / / / | |/| | | | | | | | |||
* | | | | | | | | | Merge branch 'mm/pager-less-sans-S' | Junio C Hamano | 2014-06-06 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | pager: remove 'S' from $LESS by default | Matthieu Moy | 2014-05-07 |
| | |_|_|/ / / / / | |/| | | | | | | | |||
* | | | | | | | | | First batch for 2.1 | Junio C Hamano | 2014-06-03 |
* | | | | | | | | | Merge branch 'bg/strbuf-trim' | Junio C Hamano | 2014-06-03 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | api-strbuf.txt: add docs for _trim and _ltrim | Brian Gesiak | 2014-05-06 |
| |/ / / / / / / / | |||
* | | | | | | | | | Merge branch 'dt/api-doc-setup-gently' | Junio C Hamano | 2014-06-03 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | docs: document RUN_SETUP_GENTLY and clarify RUN_SETUP | David Turner | 2014-04-30 |
* | | | | | | | | | | Merge branch 'fc/mergetool-prompt' | Junio C Hamano | 2014-06-03 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | mergetool: document the default for --[no-]prompt | Junio C Hamano | 2014-04-24 |
* | | | | | | | | | | | Merge branch 'fc/merge-default-to-upstream' | Junio C Hamano | 2014-06-03 |
|\ \ \ \ \ \ \ \ \ \ \ |