summaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Expand)AuthorAgeFilesLines
* ll-merge: make flag easier to populateJonathan Nieder2010-08-061-4/+7
* Documentation/technical: document ll_mergeJonathan Nieder2010-08-061-0/+70
* Avoid conflicts when merging branches with mixed normalizationEyvind Bernhardsen2010-07-022-0/+44
* Git 1.7.2-rc0v1.7.2-rc0Junio C Hamano2010-06-271-1/+11
* Merge branch 'cp/textconv-cat-file'Junio C Hamano2010-06-271-2/+8
|\
| * git-cat-file.txt: Document --textconvMichael J Gruber2010-06-241-2/+8
* | Merge branch 'tr/send-email-8bit'Junio C Hamano2010-06-271-0/+9
|\ \
| * | send-email: ask about and declare 8bit mailsThomas Rast2010-06-181-0/+9
* | | Merge branch 'maint'Junio C Hamano2010-06-251-1/+1
|\ \ \
| * | | Documentation: grep: fix asciidoc problem with --Christian Couder2010-06-251-1/+1
* | | | Update draft release notes to 1.7.2Junio C Hamano2010-06-221-12/+41
* | | | Merge branch 'sb/format-patch-signature'Junio C Hamano2010-06-222-0/+13
|\ \ \ \
| * | | | format-patch: Add a signature option (--signature)Stephen Boyd2010-06-162-0/+13
* | | | | Merge branch 'mg/pretty-magic-space'Junio C Hamano2010-06-221-0/+4
|\ \ \ \ \
| * | | | | pretty: Introduce ' ' modifier to add space if non-emptyMichael J Gruber2010-06-161-0/+4
| |/ / / /
* | | | | Merge branch 'cc/cherry-pick-series'Junio C Hamano2010-06-222-25/+90
|\ \ \ \ \
| * | | | | Documentation/revert: describe passing more than one commitChristian Couder2010-06-021-14/+37
| * | | | | Documentation/cherry-pick: describe passing more than one commitChristian Couder2010-06-021-11/+53
* | | | | | Merge branch 'jc/rev-list-ancestry-path'Junio C Hamano2010-06-221-3/+49
|\ \ \ \ \ \
| * | | | | | Documentation/rev-list-options.txt: Explain --ancestry-pathJohan Herland2010-06-061-2/+48
| * | | | | | Documentation/rev-list-options.txt: Fix missing line in example history graphJohan Herland2010-06-061-1/+1
* | | | | | | Merge branch 'maint'Junio C Hamano2010-06-221-0/+21
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Update draft release notes to 1.7.1.1Junio C Hamano2010-06-221-0/+21
| * | | | | | Merge branch 'jn/document-rebase-i-p-limitation' into maintJunio C Hamano2010-06-221-0/+27
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jn/checkout-doc' into maintJunio C Hamano2010-06-221-23/+31
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'tc/merge-m-log' into maintJunio C Hamano2010-06-221-1/+6
| |\ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ Merge branch 'eb/core-eol'Junio C Hamano2010-06-213-62/+169
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add "core.eol" config variableEyvind Bernhardsen2010-06-062-27/+36
| * | | | | | | | | | Rename the "crlf" attribute "text"Eyvind Bernhardsen2010-05-193-39/+49
| * | | | | | | | | | Add per-repository eol normalizationEyvind Bernhardsen2010-05-192-27/+115
* | | | | | | | | | | Merge branch 'jn/document-rebase-i-p-limitation'Junio C Hamano2010-06-211-0/+27
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | |
| * | | | | | | | | | rebase -i -p: document shortcomingsJonathan Nieder2010-06-111-0/+27
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'js/async-thread'Junio C Hamano2010-06-211-2/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Enable threaded async procedures whenever pthreads is availableJohannes Sixt2010-03-101-2/+3
* | | | | | | | | | | Merge branch 'gv/portable'Junio C Hamano2010-06-211-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Do not use "diff" found on PATH while building and installingGary V. Vaughan2010-05-311-1/+1
* | | | | | | | | | | | Merge branch 'jn/checkout-doc'Junio C Hamano2010-06-211-23/+31
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Documentation/checkout: clarify descriptionJonathan Nieder2010-06-111-19/+21
| * | | | | | | | | | | Documentation/checkout: clarify descriptionJonathan Nieder2010-05-311-11/+17
* | | | | | | | | | | | Merge branch 'em/checkout-orphan'Junio C Hamano2010-06-211-14/+21
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Documentation: alter checkout --orphan descriptionErick Mattos2010-06-021-14/+21
* | | | | | | | | | | | | Drop items that are 1.7.1.1 fixes from the 1.7.1 release notesJunio C Hamano2010-06-211-21/+0
* | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2010-06-211-0/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Update draft release notes to 1.7.1.1Junio C Hamano2010-06-211-0/+21
| * | | | | | | | | | | | Merge branch 'jk/diff-m-doc' into maintJunio C Hamano2010-06-211-0/+7
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jn/maint-doc-ignore' into maintJunio C Hamano2010-06-211-5/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'cb/assume-unchanged-fix' into maintJunio C Hamano2010-06-211-2/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jn/notes-doc' into maintJunio C Hamano2010-06-213-35/+200
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | Update draft release notes to 1.7.2Junio C Hamano2010-06-181-4/+33
* | | | | | | | | | | | | | | | | Merge branch 'ec/diff-noprefix-config'Junio C Hamano2010-06-181-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \