summaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Expand)AuthorAgeFilesLines
* push: Provide situational hints for non-fast-forward errorsChristopher Tiwald2012-03-191-2/+17
* Git 1.7.10-rc1v1.7.10-rc1Junio C Hamano2012-03-141-3/+11
* Merge branch 'ph/rerere-doc'Junio C Hamano2012-03-131-7/+12
|\
| * rerere: Document 'rerere remaining'ph/rerere-docPhil Hord2012-03-081-7/+12
* | am: officially deprecate -b/--binary optionJunio C Hamano2012-03-131-2/+2
* | Update draft release notes to 1.7.10 before -rc1Junio C Hamano2012-03-121-21/+12
* | Sync with 1.7.9.4Junio C Hamano2012-03-122-1/+26
|\ \
| * | Git 1.7.9.4v1.7.9.4Junio C Hamano2012-03-122-1/+26
* | | Update draft release notes to 1.7.10Junio C Hamano2012-03-081-10/+28
* | | Merge branch 'vr/branch-doc'Junio C Hamano2012-03-081-9/+10
|\ \ \
| * | | Documentation/git-branch: add default for --containsvr/branch-docVincent van Ravesteijn2012-03-061-2/+3
| * | | Documentation/git-branch: fix a typoVincent van Ravesteijn2012-03-061-1/+1
| * | | Documentation/git-branch: cleanupsVincent van Ravesteijn2012-03-061-6/+6
* | | | Git 1.7.10-rc0v1.7.10-rc0Junio C Hamano2012-03-071-5/+57
* | | | Merge branch 'zj/diff-stat-dyncol'Junio C Hamano2012-03-062-6/+16
|\ \ \ \
| * | | | diff --stat: add config option to limit graph widthzj/diff-stat-dyncolZbigniew Jędrzejewski-Szmek2012-03-012-7/+13
| * | | | diff --stat: enable limiting of the graph partZbigniew Jędrzejewski-Szmek2012-03-011-0/+2
| * | | | diff --stat: use a maximum of 5/8 for the filename partZbigniew Jędrzejewski-Szmek2012-03-011-6/+8
* | | | | Merge branch 'maint'Junio C Hamano2012-03-061-0/+3
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge branch 'maint-1.7.8' into maintJunio C Hamano2012-03-061-0/+3
| |\ \ \ \ | | |_|/ / | |/| | / | | | |/ | | |/|
| | * | Merge branch 'maint-1.7.7' into maint-1.7.8Junio C Hamano2012-03-061-0/+3
| | |\ \
| | | * | Document the --histogram diff optionThomas Rast2012-03-061-0/+3
* | | | | Sync with 1.7.9.3Junio C Hamano2012-03-051-1/+2
|\ \ \ \ \ | |/ / / /
| * | | | Git 1.7.9.3v1.7.9.3Junio C Hamano2012-03-051-1/+2
| * | | | Merge branch 'jc/doc-merge-options' into maintJunio C Hamano2012-03-051-11/+11
| |\ \ \ \
| * \ \ \ \ Merge branch 'cn/maint-rev-list-doc' into maintJunio C Hamano2012-03-051-6/+6
| |\ \ \ \ \
* | | | | | | fsck doc: a minor typofixJunio C Hamano2012-03-051-1/+1
* | | | | | | Update draft release notes to 1.7.10Junio C Hamano2012-03-041-34/+11
* | | | | | | Merge branch 'jk/symbolic-ref-short'Junio C Hamano2012-03-041-1/+6
|\ \ \ \ \ \ \
| * | | | | | | symbolic-ref --short: abbreviate the output unambiguouslyjk/symbolic-ref-shortJan Krüger2012-02-271-1/+6
* | | | | | | | Merge branch 'maint'Junio C Hamano2012-03-042-3/+31
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Update draft release notes to 1.7.9.3 for the last timeJunio C Hamano2012-03-041-0/+27
| * | | | | | | Merge branch 'tr/maint-bundle-long-subject' into maintJunio C Hamano2012-03-041-1/+17
| |\ \ \ \ \ \ \
| * | | | | | | | http.proxy: also mention https_proxy and all_proxyClemens Buchacher2012-03-041-3/+4
* | | | | | | | | Update draft release notes to 1.7.10Junio C Hamano2012-03-021-12/+21
* | | | | | | | | Merge branch 'maint'Junio C Hamano2012-03-021-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Documentation: do not assume that n > 1 in <rev>~$nJunio C Hamano2012-03-021-1/+1
* | | | | | | | | Merge branch 'cb/fsck-squelch-dangling'Junio C Hamano2012-03-013-10/+14
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fsck: --no-dangling omits "dangling object" informationcb/fsck-squelch-danglingJunio C Hamano2012-02-283-10/+14
* | | | | | | | | | Merge branch 'rs/no-no-no-parseopt'Junio C Hamano2012-03-012-2/+20
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | parse-options: allow positivation of options starting, with no-René Scharfe2012-02-261-1/+2
* | | | | | | | | | | Merge branch 'maint'Junio C Hamano2012-03-012-7/+12
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Documentation fixes in git-configLibor Pechacek2012-03-012-7/+12
* | | | | | | | | | | Merge branch 'cn/maint-rev-list-doc'Junio C Hamano2012-03-011-6/+6
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / | |/| | | | | | | | |
| * | | | | | | | | | Documentation: use {asterisk} in rev-list-options.txt when neededcn/maint-rev-list-docCarlos Martín Nieto2012-02-281-6/+6
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | Update draft release notes to 1.7.10Junio C Hamano2012-02-281-1/+5
* | | | | | | | | | Merge branch 'jb/required-filter'Junio C Hamano2012-02-281-10/+31
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add a setting to require a filter to be successfuljb/required-filterJehan Bing2012-02-171-10/+31
* | | | | | | | | | | Merge branch 'maint'Junio C Hamano2012-02-272-0/+19
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Update draft release notes to 1.7.9.3Junio C Hamano2012-02-271-0/+7