Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'fc/remote-helper-refmap' | Junio C Hamano | 2014-06-16 | 2 | -0/+7 |
|\ | |||||
| * | fast-import: add support to delete refs | Felipe Contreras | 2014-04-21 | 1 | -0/+3 |
| * | fast-export: add new --refspec option | Felipe Contreras | 2014-04-21 | 1 | -0/+4 |
* | | Merge branch 'jl/status-added-submodule-is-never-ignored' | Junio C Hamano | 2014-06-16 | 2 | -3/+9 |
|\ \ | |||||
| * | | status/commit: show staged submodules regardless of ignore config | Jens Lehmann | 2014-04-07 | 2 | -3/+9 |
* | | | Merge branch 'jk/strbuf-tolower' | Junio C Hamano | 2014-06-16 | 1 | -0/+4 |
|\ \ \ | |||||
| * | | | strbuf: add strbuf_tolower functionjk/strbuf-tolower | Jeff King | 2014-05-23 | 1 | -0/+4 |
* | | | | Merge branch 'jk/argv-array-for-child-process' | Junio C Hamano | 2014-06-16 | 2 | -8/+7 |
|\ \ \ \ | |||||
| * | | | | argv-array: drop "detach" codejk/argv-array-for-child-process | Jeff King | 2014-05-15 | 1 | -8/+0 |
| * | | | | run-command: store an optional argv_array | Jeff King | 2014-05-15 | 1 | -0/+7 |
* | | | | | Merge branch 'cc/replace-edit' | Junio C Hamano | 2014-06-16 | 1 | -1/+15 |
|\ \ \ \ \ | |||||
| * | | | | | Documentation: replace: describe new --edit option | Christian Couder | 2014-05-19 | 1 | -1/+15 |
* | | | | | | Merge branch 'mt/patch-id-stable' (early part) | Junio C Hamano | 2014-06-16 | 1 | -5/+32 |
|\ \ \ \ \ \ | |||||
| * | | | | | | patch-id: make it stable against hunk reordering | Michael S. Tsirkin | 2014-06-10 | 1 | -5/+32 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Update draft release notes to 2.1 | Junio C Hamano | 2014-06-09 | 1 | -2/+29 |
* | | | | | | Second batch for 2.1 | Junio C Hamano | 2014-06-06 | 1 | -0/+87 |
* | | | | | | Merge branch 'ss/howto-manage-trunk' | Junio C Hamano | 2014-06-06 | 2 | -0/+217 |
|\ \ \ \ \ \ | |||||
| * | | | | | | How to keep a project's canonical history correct.ss/howto-manage-trunk | Stephen P. Smith | 2014-05-28 | 2 | -0/+217 |
* | | | | | | | Merge branch 'jj/command-line-adjective' | Junio C Hamano | 2014-06-06 | 19 | -47/+47 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Documentation: use "command-line" when used as a compound adjective, and fix ...jj/command-line-somethingjj/command-line-adjective | Jason St. John | 2014-05-21 | 19 | -47/+47 |
* | | | | | | | | Merge branch 'jc/coding-guidelines' | Junio C Hamano | 2014-06-06 | 1 | -5/+145 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | CodingGuidelines: avoid "test <cond> -a/-o <cond>" | Junio C Hamano | 2014-05-20 | 1 | -0/+13 |
| * | | | | | | | | CodingGuidelines: on splitting a long line | Junio C Hamano | 2014-05-02 | 1 | -0/+55 |
| * | | | | | | | | CodingGuidelines: on comparison | Junio C Hamano | 2014-05-02 | 1 | -0/+27 |
| * | | | | | | | | CodingGuidelines: do not call the conditional statement "if()" | Junio C Hamano | 2014-05-02 | 1 | -1/+1 |
| * | | | | | | | | CodingGuidelines: give an example for shell function preamble | Junio C Hamano | 2014-05-02 | 1 | -3/+11 |
| * | | | | | | | | CodingGuidelines: give an example for control statements | Junio C Hamano | 2014-05-02 | 1 | -0/+11 |
| * | | | | | | | | CodingGuidelines: give an example for redirection | Junio C Hamano | 2014-05-02 | 1 | -0/+8 |
| * | | | | | | | | CodingGuidelines: give an example for case/esac statement | Junio C Hamano | 2014-05-02 | 1 | -1/+11 |
| * | | | | | | | | CodingGuidelines: once it is in, it is not worth the code churn | Junio C Hamano | 2014-05-02 | 1 | -0/+8 |
| | |_|_|/ / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'nd/status-auto-comment-char' | Junio C Hamano | 2014-06-06 | 1 | -0/+3 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | commit: allow core.commentChar=auto for character auto selectionnd/status-auto-comment-char | Nguyễn Thái Ngọc Duy | 2014-05-19 | 1 | -0/+3 |
| | |_|_|_|/ / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'wk/doc-clarify-upstream' | Junio C Hamano | 2014-06-06 | 1 | -1/+3 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Documentation: mention config sources for @{upstream}wk/doc-clarify-upstream | W. Trevor King | 2014-05-13 | 1 | -1/+3 |
* | | | | | | | | | Merge branch 'dk/raise-core-deltabasecachelimit' | Junio C Hamano | 2014-06-06 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Bump core.deltaBaseCacheLimit to 96mdk/raise-core-deltabasecachelimit | David Kastrup | 2014-05-06 | 1 | -1/+1 |
| | |_|_|_|/ / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'mm/pager-less-sans-S' | Junio C Hamano | 2014-06-06 | 1 | -5/+10 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | pager: remove 'S' from $LESS by defaultmm/pager-less-sans-S | Matthieu Moy | 2014-05-07 | 1 | -5/+10 |
| | |_|_|/ / / / / | |/| | | | | | | | |||||
* | | | | | | | | | First batch for 2.1tb/sed-bs-n-not-portable | Junio C Hamano | 2014-06-03 | 1 | -0/+86 |
* | | | | | | | | | Merge branch 'bg/strbuf-trim' | Junio C Hamano | 2014-06-03 | 1 | -0/+9 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | api-strbuf.txt: add docs for _trim and _ltrimbg/strbuf-trim | Brian Gesiak | 2014-05-06 | 1 | -0/+9 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch 'dt/api-doc-setup-gently' | Junio C Hamano | 2014-06-03 | 1 | -5/+8 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | docs: document RUN_SETUP_GENTLY and clarify RUN_SETUPdt/api-doc-setup-gently | David Turner | 2014-04-30 | 1 | -5/+8 |
* | | | | | | | | | | Merge branch 'fc/mergetool-prompt' | Junio C Hamano | 2014-06-03 | 1 | -3/+5 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | mergetool: document the default for --[no-]promptfc/mergetool-prompt | Junio C Hamano | 2014-04-24 | 1 | -3/+5 |
* | | | | | | | | | | | Merge branch 'fc/merge-default-to-upstream' | Junio C Hamano | 2014-06-03 | 1 | -3/+2 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | merge: enable defaulttoupstream by defaultfc/merge-default-to-upstream | Felipe Contreras | 2014-04-22 | 1 | -3/+2 |
| |/ / / / / / / / / / | |||||
* | | | | | | | | | | | Merge branch 'mh/ref-transaction' | Junio C Hamano | 2014-06-03 | 1 | -6/+12 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | update-ref --stdin -z: deprecate interpreting the empty string as zeros | Michael Haggerty | 2014-04-07 | 1 | -6/+12 |
* | | | | | | | | | | | | Merge branch 'as/grep-fullname-config' | Junio C Hamano | 2014-06-03 | 1 | -0/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ |