Commit message (Expand) | Author | Age | |
---|---|---|---|
* | ll-merge: replace flag argument with options struct | Jonathan Nieder | 2010-08-26 |
* | merge-recursive --renormalize | Jonathan Nieder | 2010-08-06 |
* | ll-merge: make flag easier to populate | Jonathan Nieder | 2010-08-06 |
* | Documentation/technical: document ll_merge | Jonathan Nieder | 2010-08-06 |
* | Avoid conflicts when merging branches with mixed normalization | Eyvind Bernhardsen | 2010-07-02 |
* | Git 1.7.2-rc0v1.7.2-rc0 | Junio C Hamano | 2010-06-27 |
* | Merge branch 'cp/textconv-cat-file' | Junio C Hamano | 2010-06-27 |
|\ | |||
| * | git-cat-file.txt: Document --textconv | Michael J Gruber | 2010-06-24 |
* | | Merge branch 'tr/send-email-8bit' | Junio C Hamano | 2010-06-27 |
|\ \ | |||
| * | | send-email: ask about and declare 8bit mails | Thomas Rast | 2010-06-18 |
* | | | Merge branch 'maint' | Junio C Hamano | 2010-06-25 |
|\ \ \ | |||
| * | | | Documentation: grep: fix asciidoc problem with -- | Christian Couder | 2010-06-25 |
* | | | | Update draft release notes to 1.7.2 | Junio C Hamano | 2010-06-22 |
* | | | | Merge branch 'sb/format-patch-signature' | Junio C Hamano | 2010-06-22 |
|\ \ \ \ | |||
| * | | | | format-patch: Add a signature option (--signature) | Stephen Boyd | 2010-06-16 |
* | | | | | Merge branch 'mg/pretty-magic-space' | Junio C Hamano | 2010-06-22 |
|\ \ \ \ \ | |||
| * | | | | | pretty: Introduce ' ' modifier to add space if non-empty | Michael J Gruber | 2010-06-16 |
| |/ / / / | |||
* | | | | | Merge branch 'cc/cherry-pick-series' | Junio C Hamano | 2010-06-22 |
|\ \ \ \ \ | |||
| * | | | | | Documentation/revert: describe passing more than one commit | Christian Couder | 2010-06-02 |
| * | | | | | Documentation/cherry-pick: describe passing more than one commit | Christian Couder | 2010-06-02 |
* | | | | | | Merge branch 'jc/rev-list-ancestry-path' | Junio C Hamano | 2010-06-22 |
|\ \ \ \ \ \ | |||
| * | | | | | | Documentation/rev-list-options.txt: Explain --ancestry-path | Johan Herland | 2010-06-06 |
| * | | | | | | Documentation/rev-list-options.txt: Fix missing line in example history graph | Johan Herland | 2010-06-06 |
* | | | | | | | Merge branch 'maint' | Junio C Hamano | 2010-06-22 |
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | |||
| * | | | | | | Update draft release notes to 1.7.1.1 | Junio C Hamano | 2010-06-22 |
| * | | | | | | Merge branch 'jn/document-rebase-i-p-limitation' into maint | Junio C Hamano | 2010-06-22 |
| |\ \ \ \ \ \ | |||
| * \ \ \ \ \ \ | Merge branch 'jn/checkout-doc' into maint | Junio C Hamano | 2010-06-22 |
| |\ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ | Merge branch 'tc/merge-m-log' into maint | Junio C Hamano | 2010-06-22 |
| |\ \ \ \ \ \ \ \ | |||
* | \ \ \ \ \ \ \ \ | Merge branch 'eb/core-eol' | Junio C Hamano | 2010-06-21 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | Add "core.eol" config variable | Eyvind Bernhardsen | 2010-06-06 |
| * | | | | | | | | | | Rename the "crlf" attribute "text" | Eyvind Bernhardsen | 2010-05-19 |
| * | | | | | | | | | | Add per-repository eol normalization | Eyvind Bernhardsen | 2010-05-19 |
* | | | | | | | | | | | Merge branch 'jn/document-rebase-i-p-limitation' | Junio C Hamano | 2010-06-21 |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | | | |||
| * | | | | | | | | | | rebase -i -p: document shortcomings | Jonathan Nieder | 2010-06-11 |
| | |_|_|_|_|_|_|/ / | |/| | | | | | | | | |||
* | | | | | | | | | | Merge branch 'js/async-thread' | Junio C Hamano | 2010-06-21 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | Enable threaded async procedures whenever pthreads is available | Johannes Sixt | 2010-03-10 |
* | | | | | | | | | | | Merge branch 'gv/portable' | Junio C Hamano | 2010-06-21 |
|\ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | Do not use "diff" found on PATH while building and installing | Gary V. Vaughan | 2010-05-31 |
* | | | | | | | | | | | | Merge branch 'jn/checkout-doc' | Junio C Hamano | 2010-06-21 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | |||
| * | | | | | | | | | | | Documentation/checkout: clarify description | Jonathan Nieder | 2010-06-11 |
| * | | | | | | | | | | | Documentation/checkout: clarify description | Jonathan Nieder | 2010-05-31 |
* | | | | | | | | | | | | Merge branch 'em/checkout-orphan' | Junio C Hamano | 2010-06-21 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | Documentation: alter checkout --orphan description | Erick Mattos | 2010-06-02 |
* | | | | | | | | | | | | | Drop items that are 1.7.1.1 fixes from the 1.7.1 release notes | Junio C Hamano | 2010-06-21 |
* | | | | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2010-06-21 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | |||
| * | | | | | | | | | | | | Update draft release notes to 1.7.1.1 | Junio C Hamano | 2010-06-21 |
| * | | | | | | | | | | | | Merge branch 'jk/diff-m-doc' into maint | Junio C Hamano | 2010-06-21 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jn/maint-doc-ignore' into maint | Junio C Hamano | 2010-06-21 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'cb/assume-unchanged-fix' into maint | Junio C Hamano | 2010-06-21 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jn/notes-doc' into maint | Junio C Hamano | 2010-06-21 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |