summaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Expand)AuthorAgeFilesLines
* Update draft release notes to 1.7.11 (11th batch)Junio C Hamano2012-05-111-13/+8
* Sync with 1.7.10.2Junio C Hamano2012-05-114-7/+22
|\
| * Git 1.7.10.2v1.7.10.2Junio C Hamano2012-05-112-1/+16
| * Merge branch 'ct/advise-push-default' into maintJunio C Hamano2012-05-111-2/+17
| |\
| * \ Merge branch 'jk/repack-no-explode-objects-from-old-pack' into maintJunio C Hamano2012-05-111-0/+5
| |\ \
| * \ \ Merge branch 'fa/maint-config-doc' into maintJunio C Hamano2012-05-111-5/+9
| |\ \ \
| * | | | document submdule.$name.update=none option for gitmodulesHeiko Voigt2012-05-112-6/+6
* | | | | The tenth batch of topicsJunio C Hamano2012-05-101-14/+24
* | | | | Merge branch 'jk/status-porcelain-z-b'Junio C Hamano2012-05-101-1/+1
|\ \ \ \ \
| * \ \ \ \ Merge branch 'jk/maint-status-porcelain-z-b' into HEADJeff King2012-05-081-1/+1
| |\ \ \ \ \
| | * | | | | status: respect "-b" for porcelain formatJeff King2012-05-081-1/+1
* | | | | | | Merge branch 'fa/maint-config-doc'Junio C Hamano2012-05-101-5/+9
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Documentation/git-config: describe and clarify "--local <file>" optionFlorian Achleitner2012-05-071-5/+9
* | | | | | | Merge branch 'maint'Junio C Hamano2012-05-101-0/+25
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | / / / | | |_|/ / / | |/| | | |
| * | | | | Update draft release notes to 1.7.10.2Junio C Hamano2012-05-101-0/+25
| * | | | | Merge branch 'mm/include-userpath' into maintJunio C Hamano2012-05-101-1/+4
| |\ \ \ \ \
* | | | | | | The ninth batch of topics graduated to 'master'Junio C Hamano2012-05-071-50/+19
* | | | | | | Merge branch 'th/difftool-diffall'Junio C Hamano2012-05-071-5/+12
|\ \ \ \ \ \ \
| * | | | | | | difftool: print list of valid tools with '--tool-help'Tim Henigan2012-04-231-5/+6
| * | | | | | | difftool: teach difftool to handle directory diffsTim Henigan2012-04-231-0/+6
* | | | | | | | Sync with maintJunio C Hamano2012-05-072-2/+49
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Start preparing for 1.7.10.2Junio C Hamano2012-05-071-0/+46
| * | | | | | | git p4 doc: fix formattingPete Wyckoff2012-05-071-1/+3
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'nd/columns'Junio C Hamano2012-05-035-0/+116
|\ \ \ \ \ \ \
| * | | | | | | tag: add --columnNguyễn Thái Ngọc Duy2012-04-272-0/+13
| * | | | | | | status: add --columnNguyễn Thái Ngọc Duy2012-04-272-0/+11
| * | | | | | | branch: add --columnNguyễn Thái Ngọc Duy2012-04-272-0/+13
| * | | | | | | column: add dense layout supportNguyễn Thái Ngọc Duy2012-04-271-0/+4
| * | | | | | | column: add columnar layoutNguyễn Thái Ngọc Duy2012-04-271-0/+4
| * | | | | | | Add column layout skeleton and git-columnNguyễn Thái Ngọc Duy2012-04-272-0/+71
* | | | | | | | doc/config: fix inline literalsJeff King2012-05-031-2/+2
* | | | | | | | The eighth batch of topics graduated to 'master'Junio C Hamano2012-05-021-32/+42
* | | | | | | | Merge branch 'zj/diff-stat-smaller-num-columns'Junio C Hamano2012-05-021-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | diff --stat: use less columns for change countsZbigniew Jędrzejewski-Szmek2012-04-301-2/+2
* | | | | | | | | Merge branch 'jk/doc-asciidoc-inline-literal'Junio C Hamano2012-05-0253-194/+192
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | docs: stop using asciidoc no-inline-literalJeff King2012-04-2653-194/+192
* | | | | | | | | | Merge branch 'mm/simple-push'Junio C Hamano2012-05-021-4/+22
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | push.default doc: explain simple after upstreamJunio C Hamano2012-04-241-4/+4
| * | | | | | | | | | push: document the future default change for push.default (matching -> simple)Matthieu Moy2012-04-241-2/+6
| * | | | | | | | | | push: introduce new push.default mode "simple"Matthieu Moy2012-04-241-1/+4
| * | | | | | | | | | Undocument deprecated alias 'push.default=tracking'Matthieu Moy2012-04-241-1/+0
| * | | | | | | | | | Documentation: explain push.default option a bit moreMatthieu Moy2012-04-241-3/+15
* | | | | | | | | | | Merge branch 'jc/index-v4'Junio C Hamano2012-05-022-1/+18
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | index-v4: document the entry formatJunio C Hamano2012-04-271-0/+13
| * | | | | | | | | | | update-index: upgrade/downgrade on-disk index versionJunio C Hamano2012-04-041-1/+5
* | | | | | | | | | | | Sync with v1.7.10.1Junio C Hamano2012-05-012-1/+30
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Git 1.7.10.1v1.7.10.1Junio C Hamano2012-05-012-1/+30
| * | | | | | | | | | | Merge branch 'it/fetch-pack-many-refs' into maintJunio C Hamano2012-05-011-0/+10
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'ld/git-p4-tags-and-labels'Junio C Hamano2012-04-301-12/+42
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | git p4: move verbose to base classLuke Diamand2012-04-241-7/+4