summaryrefslogtreecommitdiffstats
path: root/Documentation
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'mh/diff-indent-heuristic'Junio C Hamano2016-09-265-9/+15
|\
| * blame: honor the diff heuristic options and configMichael Haggerty2016-09-194-7/+11
| * diff: improve positioning of add/delete blocks in diffsMichael Haggerty2016-09-192-7/+9
* | Merge branch 'mm/config-color-ui-default-to-auto'Junio C Hamano2016-09-261-6/+12
|\ \
| * | Documentation/config: default for color.* is color.uiMatthieu Moy2016-09-161-6/+12
* | | Fourth batch for 2.11Junio C Hamano2016-09-211-15/+86
* | | Merge branch 'jk/reduce-gc-aggressive-depth'Junio C Hamano2016-09-211-1/+1
|\ \ \
| * | | gc: default aggressive depth to 50Jeff King2016-08-111-1/+1
* | | | Merge branch 'et/add-chmod-x'Junio C Hamano2016-09-211-1/+6
|\ \ \ \
| * | | | add: document the chmod optionThomas Gummerer2016-09-121-1/+6
* | | | | Merge branch 'js/cat-file-filters'Junio C Hamano2016-09-211-10/+30
|\ \ \ \ \
| * | | | | cat-file: support --textconv/--filters in batch modeJohannes Schindelin2016-09-111-5/+13
| * | | | | cat-file --textconv/--filters: allow specifying the path separatelyJohannes Schindelin2016-09-111-1/+6
| * | | | | cat-file: introduce the --filters optionJohannes Schindelin2016-09-111-3/+9
| * | | | | cat-file: fix a grammo in the man pageJohannes Schindelin2016-08-241-2/+3
* | | | | | Sync with maintJunio C Hamano2016-09-191-0/+33
|\ \ \ \ \ \
| * | | | | | Start preparing for 2.10.1Junio C Hamano2016-09-191-0/+33
| * | | | | | Merge branch 'po/range-doc' into maintJunio C Hamano2016-09-195-51/+88
| |\ \ \ \ \ \
* | | | | | | | Third batch for 2.11Junio C Hamano2016-09-191-0/+11
* | | | | | | | Second batch for 2.11Junio C Hamano2016-09-151-0/+25
* | | | | | | | First batch for 2.11Junio C Hamano2016-09-121-0/+41
* | | | | | | | Merge branch 'jk/diff-submodule-diff-inline'Junio C Hamano2016-09-122-11/+18
|\ \ \ \ \ \ \ \
| * | | | | | | | diff: teach diff to display submodule difference with an inline diffJacob Keller2016-08-312-11/+15
| * | | | | | | | graph: add support for --line-prefix on all graph-aware outputJacob Keller2016-08-311-0/+3
* | | | | | | | | Sync with maintJunio C Hamano2016-09-081-0/+83
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Start maintenance track for 2.10.x seriesJunio C Hamano2016-09-0827-90/+1008
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Prepare for 2.9.4Junio C Hamano2016-09-081-0/+83
| * | | | | | | | | Merge branch 'hv/doc-commit-reference-style' into maintJunio C Hamano2016-09-081-0/+10
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'ls/packet-line-protocol-doc-fix' into maintJunio C Hamano2016-09-081-3/+3
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'dg/document-git-c-in-git-config-doc' into maintJunio C Hamano2016-09-081-0/+3
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ms/document-pack-window-memory-is-per-thread' into maintJunio C Hamano2016-09-082-4/+6
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/push-force-with-lease-creation' into maintJunio C Hamano2016-09-081-2/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/reflog-date' into maintJunio C Hamano2016-09-082-9/+41
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/renormalize-merge-kill-safer-crlf' into maintJunio C Hamano2016-09-082-13/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | Start the 2.11 cycleJunio C Hamano2016-09-081-0/+56
* | | | | | | | | | | | | | | | | Merge branch 'hv/doc-commit-reference-style'Junio C Hamano2016-09-081-3/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | SubmittingPatches: use gitk's "Copy commit summary" formatBeat Bolli2016-08-261-3/+8
* | | | | | | | | | | | | | | | | Merge branch 'sb/submodule-clone-rr'Junio C Hamano2016-09-082-1/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | clone: recursive and reference option triggers submodule alternatesStefan Beller2016-08-171-0/+12
| * | | | | | | | | | | | | | | | | clone: implement optional referencesStefan Beller2016-08-151-1/+4
* | | | | | | | | | | | | | | | | | Merge branch 'jh/status-v2-porcelain'Junio C Hamano2016-09-081-6/+127
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | git-status.txt: describe --porcelain=v2 formatJeff Hostetler2016-08-111-4/+122
| * | | | | | | | | | | | | | | | | | status: support --porcelain[=<version>]Jeff Hostetler2016-08-051-2/+5
* | | | | | | | | | | | | | | | | | | Merge branch 'po/range-doc'Junio C Hamano2016-09-085-51/+88
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | doc: revisions: sort examples and fix alignment of the unchangedPhilip Oakley2016-08-131-6/+6
| * | | | | | | | | | | | | | | | | | doc: revisions: show revision expansion in examplesPhilip Oakley2016-08-131-6/+17
| * | | | | | | | | | | | | | | | | | doc: revisions - clarify reachability examplesPhilip Oakley2016-08-131-5/+6
| * | | | | | | | | | | | | | | | | | doc: revisions - define `reachable`Philip Oakley2016-08-131-4/+10
| * | | | | | | | | | | | | | | | | | doc: gitrevisions - clarify 'latter case' is revision walkPhilip Oakley2016-08-131-2/+2
| * | | | | | | | | | | | | | | | | | doc: gitrevisions - use 'reachable' in page descriptionPhilip Oakley2016-08-131-2/+2