Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Sync with maint | Junio C Hamano | 2014-06-25 | 2 | -1/+117 |
|\ | |||||
| * | Git 2.0.1v2.0.1 | Junio C Hamano | 2014-06-25 | 2 | -1/+117 |
| * | Merge branch 'jl/status-added-submodule-is-never-ignored' into maint | Junio C Hamano | 2014-06-25 | 2 | -3/+9 |
| |\ | |||||
* | | | Fifth batch for 2.1 | Junio C Hamano | 2014-06-25 | 1 | -2/+14 |
* | | | Merge branch 'ye/doc-http-proto' | Junio C Hamano | 2014-06-25 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | http-protocol.txt: Basic Auth is defined in RFC 2617, not RFC 2616ye/doc-http-proto | Yi EungJun | 2014-06-16 | 1 | -1/+1 |
| |/ / | |||||
* | | | Merge branch 'mc/doc-submodule-sync-recurse' | Junio C Hamano | 2014-06-25 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | submodule: document "sync --recursive"mc/doc-submodule-sync-recurse | Matthew Chen | 2014-06-13 | 1 | -1/+1 |
* | | | | Merge branch 'jk/repack-pack-writebitmaps-config' | Junio C Hamano | 2014-06-25 | 1 | -7/+10 |
|\ \ \ \ | |||||
| * | | | | repack: introduce repack.writeBitmaps config option | Jeff King | 2014-06-10 | 1 | -7/+10 |
* | | | | | Fourth batch for 2.1 | Junio C Hamano | 2014-06-20 | 1 | -0/+9 |
* | | | | | Merge branch 'jc/fetch-pull-refmap' | Junio C Hamano | 2014-06-20 | 3 | -57/+122 |
|\ \ \ \ \ | |||||
| * | | | | | docs: Explain the purpose of fetch's and pull's <refspec> parameter.jc/fetch-pull-refmap | Marc Branchaud | 2014-06-12 | 2 | -6/+16 |
| * | | | | | fetch: allow explicit --refmap to override configurationjc/fetch-push-refmap | Junio C Hamano | 2014-06-05 | 2 | -0/+12 |
| * | | | | | fetch doc: add a section on configured remote-tracking branches | Junio C Hamano | 2014-06-05 | 1 | -0/+45 |
| * | | | | | fetch doc: remove "short-cut" section | Junio C Hamano | 2014-06-04 | 1 | -13/+3 |
| * | | | | | fetch doc: update refspec format description | Junio C Hamano | 2014-06-04 | 1 | -0/+1 |
| * | | | | | fetch doc: on pulling multiple refspecs | Junio C Hamano | 2014-06-04 | 1 | -7/+12 |
| * | | | | | fetch doc: remove notes on outdated "mixed layout" | Junio C Hamano | 2014-06-02 | 1 | -13/+0 |
| * | | | | | fetch doc: update note on '+' in front of the refspec | Junio C Hamano | 2014-06-02 | 1 | -9/+9 |
| * | | | | | fetch doc: move FETCH_HEAD material lower and add an example | Marc Branchaud | 2014-06-02 | 1 | -8/+21 |
| * | | | | | fetch doc: update introductory part for clarity | Junio C Hamano | 2014-05-30 | 1 | -11/+13 |
* | | | | | | Merge branch 'mt/send-email-cover-to-cc' | Junio C Hamano | 2014-06-20 | 1 | -0/+12 |
|\ \ \ \ \ \ | |||||
| * | | | | | | git-send-email: two new options: to-cover, cc-cover | Michael S. Tsirkin | 2014-04-29 | 1 | -0/+12 |
* | | | | | | | Merge branch 'jm/api-strbuf-doc' | Junio C Hamano | 2014-06-20 | 1 | -5/+5 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | api-strbuf.txt minor typosjm/api-strbuf-doc | Jeremiah Mahler | 2014-06-09 | 1 | -5/+5 |
| | |_|_|_|/ / | |/| | | | | | |||||
* | | | | | | | Third batch for 2.1 | Junio C Hamano | 2014-06-16 | 1 | -0/+80 |
* | | | | | | | Merge branch 'ta/string-list-init' | Junio C Hamano | 2014-06-16 | 1 | -0/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | string-list: spell all values out that are given to a string_list initializer | Tanay Abhra | 2014-06-06 | 1 | -0/+2 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'sh/enable-preloadindex' | Junio C Hamano | 2014-06-16 | 1 | -2/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | environment.c: enable core.preloadindex by defaultsh/enable-preloadindex | Steve Hoelzer | 2014-06-03 | 1 | -2/+2 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'jm/doc-wording-tweaks' | Junio C Hamano | 2014-06-16 | 2 | -9/+8 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Documentation: wording fixes in the user manual and glossaryjm/doc-wording-tweaks | Jeremiah Mahler | 2014-05-28 | 2 | -9/+8 |
* | | | | | | | | Merge branch 'jm/format-patch-mail-sig' | Junio C Hamano | 2014-06-16 | 2 | -0/+8 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | format-patch: add "--signature-file=<file>" optionjm/format-patch-mail-sig | Jeremiah Mahler | 2014-05-27 | 2 | -0/+8 |
* | | | | | | | | | Merge branch 'jk/http-errors' | Junio C Hamano | 2014-06-16 | 1 | -0/+5 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | strbuf: add strbuf_reencode helper | Jeff King | 2014-05-27 | 1 | -0/+5 |
| | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | 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 |
|\ \ \ \ \ \ \ \ \ \ \ |