aboutsummaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Expand)AuthorAge
* merge-recursive: options to ignore whitespace changesJustin Frankel2010-08-27
* merge-recursive --patienceJustin Frankel2010-08-26
* ll-merge: replace flag argument with options structJonathan Nieder2010-08-26
* merge-recursive --renormalizeJonathan Nieder2010-08-06
* ll-merge: make flag easier to populateJonathan Nieder2010-08-06
* Documentation/technical: document ll_mergeJonathan Nieder2010-08-06
* Avoid conflicts when merging branches with mixed normalizationEyvind Bernhardsen2010-07-02
* Git 1.7.2-rc0v1.7.2-rc0Junio C Hamano2010-06-27
* Merge branch 'cp/textconv-cat-file'Junio C Hamano2010-06-27
|\
| * git-cat-file.txt: Document --textconvMichael J Gruber2010-06-24
* | Merge branch 'tr/send-email-8bit'Junio C Hamano2010-06-27
|\ \
| * | send-email: ask about and declare 8bit mailsThomas Rast2010-06-18
* | | Merge branch 'maint'Junio C Hamano2010-06-25
|\ \ \
| * | | Documentation: grep: fix asciidoc problem with --Christian Couder2010-06-25
* | | | Update draft release notes to 1.7.2Junio C Hamano2010-06-22
* | | | Merge branch 'sb/format-patch-signature'Junio C Hamano2010-06-22
|\ \ \ \
| * | | | format-patch: Add a signature option (--signature)Stephen Boyd2010-06-16
* | | | | Merge branch 'mg/pretty-magic-space'Junio C Hamano2010-06-22
|\ \ \ \ \
| * | | | | pretty: Introduce ' ' modifier to add space if non-emptyMichael J Gruber2010-06-16
| |/ / / /
* | | | | Merge branch 'cc/cherry-pick-series'Junio C Hamano2010-06-22
|\ \ \ \ \
| * | | | | Documentation/revert: describe passing more than one commitChristian Couder2010-06-02
| * | | | | Documentation/cherry-pick: describe passing more than one commitChristian Couder2010-06-02
* | | | | | Merge branch 'jc/rev-list-ancestry-path'Junio C Hamano2010-06-22
|\ \ \ \ \ \
| * | | | | | Documentation/rev-list-options.txt: Explain --ancestry-pathJohan Herland2010-06-06
| * | | | | | Documentation/rev-list-options.txt: Fix missing line in example history graphJohan Herland2010-06-06
* | | | | | | Merge branch 'maint'Junio C Hamano2010-06-22
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Update draft release notes to 1.7.1.1Junio C Hamano2010-06-22
| * | | | | | Merge branch 'jn/document-rebase-i-p-limitation' into maintJunio C Hamano2010-06-22
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jn/checkout-doc' into maintJunio C Hamano2010-06-22
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'tc/merge-m-log' into maintJunio C Hamano2010-06-22
| |\ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ Merge branch 'eb/core-eol'Junio C Hamano2010-06-21
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add "core.eol" config variableEyvind Bernhardsen2010-06-06
| * | | | | | | | | | Rename the "crlf" attribute "text"Eyvind Bernhardsen2010-05-19
| * | | | | | | | | | Add per-repository eol normalizationEyvind Bernhardsen2010-05-19
* | | | | | | | | | | Merge branch 'jn/document-rebase-i-p-limitation'Junio C Hamano2010-06-21
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | |
| * | | | | | | | | | rebase -i -p: document shortcomingsJonathan Nieder2010-06-11
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'js/async-thread'Junio C Hamano2010-06-21
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Enable threaded async procedures whenever pthreads is availableJohannes Sixt2010-03-10
* | | | | | | | | | | Merge branch 'gv/portable'Junio C Hamano2010-06-21
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Do not use "diff" found on PATH while building and installingGary V. Vaughan2010-05-31
* | | | | | | | | | | | Merge branch 'jn/checkout-doc'Junio C Hamano2010-06-21
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Documentation/checkout: clarify descriptionJonathan Nieder2010-06-11
| * | | | | | | | | | | Documentation/checkout: clarify descriptionJonathan Nieder2010-05-31
* | | | | | | | | | | | Merge branch 'em/checkout-orphan'Junio C Hamano2010-06-21
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Documentation: alter checkout --orphan descriptionErick Mattos2010-06-02
* | | | | | | | | | | | | Drop items that are 1.7.1.1 fixes from the 1.7.1 release notesJunio C Hamano2010-06-21
* | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2010-06-21
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Update draft release notes to 1.7.1.1Junio C Hamano2010-06-21
| * | | | | | | | | | | | Merge branch 'jk/diff-m-doc' into maintJunio C Hamano2010-06-21
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jn/maint-doc-ignore' into maintJunio C Hamano2010-06-21
| |\ \ \ \ \ \ \ \ \ \ \ \ \