summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jn/format-patch-doc'Junio C Hamano2011-05-044-195/+229
|\
| * Documentation/format-patch: suggest Toggle Word Wrap add-on for ThunderbirdJohannes Sixt2011-04-191-4/+14
| * Documentation: publicize hints for sending patches with GMailJonathan Nieder2011-04-154-55/+61
| * Documentation: publicize KMail hints for sending patches inlineJonathan Nieder2011-04-152-20/+18
| * Documentation: hints for sending patches inline with ThunderbirdJonathan Nieder2011-04-152-80/+84
| * Documentation: explain how to check for patch corruptionJonathan Nieder2011-04-152-44/+60
| * Merge v1.7.5-rc2 into jn/format-patch-docJunio C Hamano2011-04-15431-4909/+12524
| |\
* | \ Merge branch 'vr/merge-base-doc'Junio C Hamano2011-05-042-14/+23
|\ \ \
| * | | Restructure documentation for git-merge-base.Jonathan Nieder2011-04-151-12/+16
| * | | Documentation: update to git-merge-base --octopusVincent van Ravesteijn2011-04-152-2/+7
* | | | Merge branch 'ss/cherry-pick-x-doc'Junio C Hamano2011-05-041-3/+4
|\ \ \ \
| * | | | doc: Clarify that "cherry-pick -x" does not use "git notes"Sebastian Schuberth2011-04-151-3/+4
| |/ / /
* | | | Merge branch 'jn/maint-format-patch-doc'Junio C Hamano2011-05-041-0/+58
|\ \ \ \ | | |/ / | |/| |
| * | | Documentation: describe the format of messages with inline patchesJonathan Nieder2011-04-151-0/+58
| |/ /
* | | Merge branch 'jk/format-patch-multiline-header'Junio C Hamano2011-05-042-0/+24
|\ \ \
| * | | format-patch: wrap email addresses after long namesJeff King2011-04-142-0/+24
* | | | Merge branch 'jm/mergetool-submodules'Junio C Hamano2011-05-042-9/+371
|\ \ \ \
| * | | | mergetool: Teach about submodulesJonathon Mah2011-04-132-9/+371
* | | | | Sync with 1.7.5.1Junio C Hamano2011-05-043-1/+37
|\ \ \ \ \
| * | | | | Git 1.7.5.1v1.7.5.1Junio C Hamano2011-05-043-2/+36
| * | | | | Merge branch 'jh/dirstat' into maintJunio C Hamano2011-05-048-12/+81
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'sp/maint-clear-postfields' into maintJunio C Hamano2011-05-041-0/+1
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jk/maint-stash-oob' into maintJunio C Hamano2011-05-042-16/+12
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jk/maint-upload-pack-shallow' into maintJunio C Hamano2011-05-041-12/+11
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'dm/stash-k-i-p' into maintJunio C Hamano2011-05-043-4/+25
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jc/pack-objects-bigfile' into maintJunio C Hamano2011-05-046-9/+14
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'mg/reflog-with-options' into maintJunio C Hamano2011-05-042-13/+35
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/stash-loosen-safety' into maintJunio C Hamano2011-05-042-7/+17
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ar/clean-rmdir-empty' into maintJunio C Hamano2011-05-042-1/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mg/sha1-path-advise' into maintJunio C Hamano2011-05-042-9/+19
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | git-add.txt: document 'add.ignoreErrors'Valentin Haenel2011-05-041-0/+2
* | | | | | | | | | | | | | | | Update draft release notes to 1.7.6Junio C Hamano2011-05-021-5/+15
* | | | | | | | | | | | | | | | Merge branch 'jk/notes-ui-updates'Junio C Hamano2011-05-028-41/+109
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | contrib/completion: --notes, --no-notesMichael J Gruber2011-04-141-1/+1
| * | | | | | | | | | | | | | | | log/pretty-options: Document --[no-]notes and deprecate old notes optionsJohan Herland2011-03-302-12/+27
| * | | | | | | | | | | | | | | | revision.c: make --no-notes reset --notes listJeff King2011-03-292-0/+22
| * | | | | | | | | | | | | | | | revision.c: support --notes command-line optionJeff King2011-03-292-5/+32
| * | | | | | | | | | | | | | | | notes: refactor display notes default handlingJeff King2011-03-293-4/+10
| * | | | | | | | | | | | | | | | notes: refactor display notes extra refs fieldJeff King2011-03-293-6/+6
| * | | | | | | | | | | | | | | | revision.c: refactor notes ref expansionJeff King2011-03-291-6/+1
| * | | | | | | | | | | | | | | | notes: make expand_notes_ref globally accessibleJeff King2011-03-293-10/+13
* | | | | | | | | | | | | | | | | Merge branch 'ab/i18n-fixup'Junio C Hamano2011-05-0240-383/+375
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | i18n: use test_i18n{cmp,grep} in t7600, t7607, t7611 and t7811Junio C Hamano2011-04-144-19/+10
| * | | | | | | | | | | | | | | | | i18n: use test_i18n{grep,cmp} in t7508Junio C Hamano2011-04-141-120/+102
| * | | | | | | | | | | | | | | | | i18n: use test_i18ngrep in t7506Junio C Hamano2011-04-141-28/+28
| * | | | | | | | | | | | | | | | | i18n: use test_i18ngrep and test_i18ncmp in t7502Junio C Hamano2011-04-131-41/+31
| * | | | | | | | | | | | | | | | | i18n: use test_i18ngrep in t7501Junio C Hamano2011-04-131-3/+4
| * | | | | | | | | | | | | | | | | i18n: use test_i18ncmp in t7500Junio C Hamano2011-04-131-5/+5
| * | | | | | | | | | | | | | | | | i18n: use test_i18ngrep in t7201Junio C Hamano2011-04-131-7/+7
| * | | | | | | | | | | | | | | | | i18n: use test_i18ncmp and test_i18ngrep in t7102 and t7110Junio C Hamano2011-04-132-8/+8
View Lorry Controller Status