summaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'cb/assume-unchanged-fix'Junio C Hamano2010-06-131-2/+0
|\
| * Documentation: git-add does not update files marked "assume unchanged"Clemens Buchacher2010-05-081-2/+0
* | Merge branch 'jn/notes-doc'Junio C Hamano2010-06-133-35/+200
|\ \
| * | Documentation/notes: nitpicksJonathan Nieder2010-05-081-6/+6
| * | Documentation/notes: clean up description of rewriting configurationJonathan Nieder2010-05-081-18/+29
| * | Documentation/notes: simplify treatment of default display refsJonathan Nieder2010-05-081-17/+19
| * | Documentation/log: add a CONFIGURATION sectionJonathan Nieder2010-05-081-0/+42
| * | Documentation/notes: simplify treatment of default notes refJonathan Nieder2010-05-081-11/+20
| * | Documentation/notes: add configuration sectionJonathan Nieder2010-05-081-0/+59
| * | Documentation/notes: describe content of notes blobsJonathan Nieder2010-05-081-1/+37
| * | Documentation/notes: document format of notes treesJonathan Nieder2010-05-082-20/+26
* | | Merge branch 'wp/pretty-enhancement'Junio C Hamano2010-06-132-1/+16
|\ \ \
| * | | pretty: add aliases for pretty formatsWill Palmer2010-05-032-1/+16
| |/ /
* | | Merge branch 'maint'Junio C Hamano2010-06-131-3/+3
|\ \ \
| * | | add-interactive: Clarify “remaining hunks in the file”Jonathan Nieder2010-06-131-3/+3
* | | | Merge branch 'maint'Junio C Hamano2010-06-071-4/+5
|\ \ \ \ | |/ / /
| * | | commit.txt: clarify how --author argument is usedJay Soffian2010-06-061-4/+5
* | | | Merge branch 'maint'Junio C Hamano2010-06-024-4/+13
|\ \ \ \ | |/ / /
| * | | Documentation: A...B shortcut for checkout and rebaseMichael J Gruber2010-06-022-0/+8
| * | | Documentation/pretty-{formats,options}: better reference for "format:<string>"Nazri Ramliy2010-06-022-4/+5
* | | | Merge branch 'maint'Junio C Hamano2010-05-312-1/+8
|\ \ \ \ | |/ / /
| * | | Merge branch 'maint-1.7.0' into maintJunio C Hamano2010-05-311-0/+7
| |\ \ \
| | * | | Documentation/config: describe status.submodulesummaryMichael J Gruber2010-05-281-0/+7
| | | |/ | | |/|
| * | | Documentation/SubmittingPatches: Fix typo in GMail sectionTim Henigan2010-05-311-1/+1
* | | | Merge branch 'maint'Junio C Hamano2010-05-251-19/+21
|\ \ \ \ | |/ / /
| * | | Documentation/SubmittingPatches: clarify GMail section and SMTPMichael J Gruber2010-05-251-19/+21
* | | | Merge branch 'by/blame-doc-m-c'Junio C Hamano2010-05-211-4/+6
|\ \ \ \
| * | | | blame-options.txt: Add default value for `-M/-C` options.Bo Yang2010-05-071-4/+6
* | | | | Merge branch 'by/log-follow'Junio C Hamano2010-05-211-1/+1
|\ \ \ \ \
| * | | | | Make git log --follow find copies among unmodified files.Bo Yang2010-05-071-1/+1
| |/ / / /
* | | | | Merge branch 'rr/doc-submitting'Junio C Hamano2010-05-211-11/+38
|\ \ \ \ \
| * | | | | SubmittingPatches: Add new section about what to base work onRamkumar Ramachandra2010-04-181-11/+38
* | | | | | Merge branch 'st/remote-tags-no-tags'Junio C Hamano2010-05-212-2/+10
|\ \ \ \ \ \
| * | | | | | remote add: add a --[no-]tags optionSamuel Tardieu2010-04-191-1/+7
| * | | | | | Honor "tagopt = --tags" configuration optionSamuel Tardieu2010-04-191-1/+3
* | | | | | | Merge branch 'jn/shortlog'Junio C Hamano2010-05-211-1/+14
|\ \ \ \ \ \ \
| * | | | | | | shortlog: Document and test --format optionJonathan Nieder2010-05-041-0/+8
| * | | | | | | Documentation/shortlog: scripted users should not rely on implicit HEADJonathan Nieder2010-05-041-1/+6
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'jc/maint-no-reflog-expire-unreach-for-head'Junio C Hamano2010-05-212-2/+18
|\ \ \ \ \ \ \
| * | | | | | | Document gc.<pattern>.reflogexpire variablesJunio C Hamano2010-04-142-2/+18
* | | | | | | | Merge branch 'tr/word-diff'Junio C Hamano2010-05-212-5/+37
|\ \ \ \ \ \ \ \
| * | | | | | | | diff: add --word-diff option that generalizes --color-wordsThomas Rast2010-04-142-5/+37
* | | | | | | | | Merge branch 'ld/discovery-limit-to-fs' (early part)Junio C Hamano2010-05-211-0/+10
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Rename ONE_FILESYSTEM to DISCOVERY_ACROSS_FILESYSTEMJunio C Hamano2010-04-041-5/+5
| * | | | | | | | | GIT_ONE_FILESYSTEM: flip the default to stop at filesystem boundariesJunio C Hamano2010-04-041-4/+8
| * | | | | | | | | Add support for GIT_ONE_FILESYSTEMLars R. Damerow2010-03-281-0/+6
* | | | | | | | | | Merge branch 'ar/config-from-command-line'Junio C Hamano2010-05-211-0/+7
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Allow passing of configuration parameters in the command lineAlex Riesen2010-03-281-0/+7
* | | | | | | | | | | Merge branch 'em/checkout-orphan'Junio C Hamano2010-05-211-1/+19
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | git checkout: create unparented branch by --orphanErick Mattos2010-03-211-1/+19
| |/ / / / / / / / / /