summaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jm/doc-ref-prune'Junio C Hamano2013-07-242-3/+3
|\
| * Documentation: fix git-prune example usagejm/doc-ref-pruneJonathon Mah2013-07-181-1/+1
| * Documentation: remove --prune from pack-refs examplesJonathon Mah2013-07-181-2/+2
* | Sync with Git 1.8.3.4Junio C Hamano2013-07-222-3/+4
|\ \
| * | Git 1.8.3.4v1.8.3.4Junio C Hamano2013-07-221-1/+2
| * | update URL to the marc.info mail archiveOndřej Bílka2013-07-221-2/+2
* | | Update draft release notes to 1.8.4Junio C Hamano2013-07-221-0/+50
* | | Merge branch 'rr/send-email-ssl-verify'Junio C Hamano2013-07-222-0/+10
|\ \ \
| * | | send-email: be explicit with SSL certificate verificationrr/send-email-ssl-verifyRamkumar Ramachandra2013-07-182-0/+10
* | | | Merge branch 'es/check-mailmap'Junio C Hamano2013-07-221-0/+47
|\ \ \ \
| * | | | builtin: add git-check-mailmap commandEric Sunshine2013-07-131-0/+47
* | | | | Merge branch 'jx/clean-interactive'Junio C Hamano2013-07-222-10/+82
|\ \ \ \ \
| * | | | | git-clean: add documentation for interactive git-cleanJiang Xin2013-06-261-2/+63
| * | | | | git-clean: add colors to interactive git-cleanJiang Xin2013-06-261-8/+9
| * | | | | git-clean: show items of del_list in columnsJiang Xin2013-06-261-0/+4
| * | | | | git-clean: add support for -i/--interactiveJiang Xin2013-06-261-2/+8
* | | | | | Merge branch 'hv/config-from-blob'Junio C Hamano2013-07-221-0/+7
|\ \ \ \ \ \
| * | | | | | teach config --blob option to parse config from databaseHeiko Voigt2013-07-121-0/+7
* | | | | | | Merge branch 'db/show-ref-head'Junio C Hamano2013-07-221-4/+6
|\ \ \ \ \ \ \
| * | | | | | | show-ref: make --head always show the HEAD refdb/show-ref-headDoug Bell2013-07-171-4/+6
* | | | | | | | Merge branch 'es/blame-L-breakage'Junio C Hamano2013-07-221-3/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | blame-options.txt: explain that -L <start> and <end> are optionalEric Sunshine2013-07-171-2/+5
| * | | | | | | | blame-options.txt: place each -L option variation on its own lineEric Sunshine2013-07-171-1/+2
* | | | | | | | | Merge branch 'mm/diff-no-patch-synonym-to-s'Junio C Hamano2013-07-224-7/+18
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Documentation/git-log.txt: capitalize section namesmm/diff-no-patch-synonym-to-sMatthieu Moy2013-07-171-4/+4
| * | | | | | | | | Documentation: move description of -s, --no-patch to diff-options.txtMatthieu Moy2013-07-172-4/+5
| * | | | | | | | | Documentation/git-show.txt: include common diff options, like git-log.txtMatthieu Moy2013-07-171-0/+9
| * | | | | | | | | diff: allow --no-patch as synonym for -sMatthieu Moy2013-07-171-0/+1
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Sync with maintJunio C Hamano2013-07-211-0/+5
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | Update draft release notes to 1.8.3.4Junio C Hamano2013-07-211-0/+5
| * | | | | | | | Merge branch 'rr/maint-fetch-tag-doc-asterisks' into maintJunio C Hamano2013-07-211-1/+1
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'nk/config-local-doc' into maintJunio C Hamano2013-07-211-0/+9
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'kb/diff-blob-blob-doc' into maintJunio C Hamano2013-07-211-7/+7
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'mm/merge-in-dirty-worktree-doc' into maintJunio C Hamano2013-07-211-2/+2
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ph/builtin-srcs-are-in-subdir-these-days' into maintJunio C Hamano2013-07-214-15/+16
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ft/doc-git-transport' into maintJunio C Hamano2013-07-211-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ Sync with maintJunio C Hamano2013-07-192-1/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | Start preparing for 1.8.3.4Junio C Hamano2013-07-191-0/+15
| * | | | | | | | | | | | | | Merge branch 'rr/name-rev-stdin-doc' into maintJunio C Hamano2013-07-191-2/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ft/diff-rename-default-score-is-half' into maintJunio C Hamano2013-07-191-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'wk/doc-git-has-grown' into maintJunio C Hamano2013-07-191-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ys/cygstart' into maintJunio C Hamano2013-07-191-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mm/push-force-is-dangerous' into maintJunio C Hamano2013-07-191-0/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rr/column-doc' into maintJunio C Hamano2013-07-191-3/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Documentation: "git reset <tree-ish> <pathspec>" takes a tree-ish, not tree-shStefan Beller2013-07-191-1/+1
* | | | | | | | | | | | | | | | | | | | | Update draft release notes to 1.8.4Junio C Hamano2013-07-181-0/+16
* | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/revert-clone-doc-update-for-push-from-shallow'Junio C Hamano2013-07-181-7/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Revert "git-clone.txt: remove the restriction on pushing from a shallow clone"jc/revert-clone-doc-update-for-push-from-shallowJunio C Hamano2013-07-151-7/+5
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/in-pack-size-measurement'Junio C Hamano2013-07-181-11/+68
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | cat-file: split --batch input lines on whitespaceJeff King2013-07-121-2/+8